Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Turret Entities #38

Merged
merged 6 commits into from
Mar 15, 2018
Merged

Turret Entities #38

merged 6 commits into from
Mar 15, 2018

Conversation

Acruid
Copy link
Contributor

@Acruid Acruid commented Mar 4, 2018 •
edited
Loading

Adds a functioning spotlight turret as an example of the new features added to the engine.

Sibling PR of /pull/532.

BEFORE MERGE

@Acruid Acruid added S: DO NOT MERGE Status: Open item that should NOT be merged. DNM. Allows test to run unlike draft. S: Needs Engine PR Merged Status: Requires an existing Robust Toolbox PR to be merged first. labels Mar 4, 2018
@ghost ghost assigned Acruid Mar 4, 2018
@ghost ghost added the review label Mar 4, 2018
@Acruid Acruid removed the S: DO NOT MERGE Status: Open item that should NOT be merged. DNM. Allows test to run unlike draft. label Mar 4, 2018
@Acruid Acruid removed the S: Needs Engine PR Merged Status: Requires an existing Robust Toolbox PR to be merged first. label Mar 9, 2018
@PJB3005
Copy link
Member

PJB3005 commented Mar 10, 2018

Still seems to be conflicting.

@ZoldorfTheWizard
Copy link
Member

@Acruid bwoink

@Acruid Acruid force-pushed the 18-02-26_Spotlight_Turret branch from 605d488 to 357e5fb Compare March 14, 2018 00:35
@PJB3005 PJB3005 merged commit 071ed3f into space-wizards:master Mar 15, 2018
@ghost ghost removed the review label Mar 15, 2018
rbertoche referenced this pull request in rbertoche/space-station-14 Oct 1, 2022
@Elijahrane
Mail now more successfully places its contents in the opener's hands (#…
a59b287 
…38)
Morb0 pushed a commit to Morb0/space-station-14 that referenced this pull request Oct 30, 2022
@SS14-RU
fix: yaml name inheritance (space-wizards#38)
ee1d0cc
CaptainSqrBeard pushed a commit to CaptainSqrBeard/space-station-14 that referenced this pull request Jan 19, 2023
@PilgrimViis
Iaa backpack (space-wizards#38)
01cf3c4 
* Added a special backpack for the iaa

* Changed colors to lether

* Fixed error with copyright

* Added localisation
moonheart08 pushed a commit to moonheart08/space-station-14 that referenced this pull request Mar 16, 2023
@silicons-bot @ElectroJr @lunar-crater-ex
[MIRROR] Changes required for component tree engine PR (space-wizards#38
81065cf 
)

* Changes required for component tree engine PR (space-wizards#13109)

* Changes required for component tree engine PR

Co-authored-by: Leon Friedrich <[email protected]>
Co-authored-by: lunar-crater-ex <[email protected]>
moonheart08 added a commit to moonheart08/space-station-14 that referenced this pull request Mar 16, 2023
@moonheart08
Buff the SMES and substation. (space-wizards#38)
ca62b21 
wa

Co-authored-by: moonheart08 <[email protected]>
Just-a-Unity-Dev added a commit to Just-a-Unity-Dev/space-station-14 that referenced this pull request Jul 14, 2023
@Just-a-Unity-Dev
No more fragile missiles (space-wizards#38)
15f95d3 
* strong missiles

* changes the names and descriptions of weapons
Partmedia pushed a commit to Partmedia/space-station-14 that referenced this pull request Jul 16, 2023
@Cheackraze
Merge pull request space-wizards#38 from new-frontiers-14/telepad_speed
780c357 
telepad_speed
joshepvodka pushed a commit to joshepvodka/space-station-14 that referenced this pull request Feb 5, 2024
@SS14-RU @joshepvodka
fix: yaml name inheritance (space-wizards#38)
6c2b11f
DoutorWhite pushed a commit to TucanoStation/tucano-station-14 that referenced this pull request Feb 5, 2024
@SS14-RU @DoutorWhite
fix: yaml name inheritance (space-wizards#38)
3db5eaf
DoutorWhite added a commit to TucanoStation/tucano-station-14 that referenced this pull request Feb 5, 2024
@DoutorWhite
Revert "fix: yaml name inheritance (space-wizards#38)"
9d38c3b 
This reverts commit 3db5eaf.
LankLTE pushed a commit to LankLTE/space-station-14 that referenced this pull request Feb 18, 2024
@PursuitInAshes @LankLTE
Add additional HoS Winter Coat matching Warden's (space-wizards#38)
b6b0a15 
* Initial Resprite, Copyright v1

* Give it armor, description, rename

* Move New HoS Coat to own files

* Bring back old coat

* Add coats to Lockers + Printers

* Remove really poorly done hoodie string
arimah pushed a commit to arimah/space-station-14 that referenced this pull request Mar 19, 2024
@Aexxie
Merge pull request space-wizards#38 from Umbra-Cosmatic-Drift/spycrew…
2af41c3 
…monitor-fix

Remove SpyCrewMonitor from Thief loadout.
deltanedas pushed a commit to deltanedas/space-station-14 that referenced this pull request May 4, 2024
@ps3moira
Merge pull request space-wizards#38 from greystation14/Clown-Locker-Fill
b674d22 
Clown Locker Filled
Tsawodi pushed a commit to Tsawodi/space-station-14 that referenced this pull request Sep 11, 2024
@KeldWolf
Merge pull request space-wizards#38 from ss14-harmony/fixSubmodules
97a6731 
Robust?
Doctor-Cpu added a commit to Doctor-Cpu/space-station-14 that referenced this pull request Sep 19, 2024
@Doctor-Cpu
Merge pull request space-wizards#38 from Doctor-Cpu/soft-stam
08e4205 
Soft stamina
Ilya246 pushed a commit to Ilya246/space-station-14 that referenced this pull request Oct 10, 2024
@Verbalase
Merge pull request space-wizards#38 from CatMagic1/clown-cuffs
beaa321 
clown cuffs!
SlamBamActionman pushed a commit to SlamBamActionman/space-station-14 that referenced this pull request Nov 1, 2024
@Necro-a @TsjipTsjip
Necroa's salvage update (space-wizards#38)
f2ccbc3 
* added facility uwu

* hehe finished i think

* fixed tags

* added a salvage version of the abomination enemy

* added the files to the appropriate namespace.

* added # umbra tags

* thing

* Nerfed drops and shit

* fixed dungeon_configs.yml

* appeasing the damn linter

* Update tags.yml

* fixed locale files

---------

Co-authored-by: TsjipTsjip <[email protected]>
Fildrance pushed a commit to Fildrance/space-station-14 that referenced this pull request Dec 2, 2024
@FireNameFN
АПИИ 2 (space-wizards#38)
199dc73 
* First commit

* Improvements

* Fix

* Removed holo

* Edited items

* Starts and ends

* _corvaxnext

* Fix part 1

* Fix part 2

* Ftl fix

* Added greeting

* Attribution

* ApiRule

* Reverted ThiefRule

* EndRound improvements

* Revert ThiefRuleSystem again

* .ftl changes
Quantum-cross pushed a commit to Quantum-cross/space-station-14 that referenced this pull request Jan 23, 2025
@ss14-Starlight
Merge pull request space-wizards#38 from ss14Starlight/eye-implants
5756539 
Update auto-changelog.yml

(cherry picked from commit 399bb38)
Quantum-cross pushed a commit to Quantum-cross/space-station-14 that referenced this pull request Jan 23, 2025
@github-actions
Update changelog for PR space-wizards#38 [skip ci]
9adfd70 
(cherry picked from commit f042ddf)
12rabbits pushed a commit to 12rabbits/space-station-14 that referenced this pull request Feb 17, 2025
@AirFryerBuyOneGetOneFree
Merge pull request space-wizards#38 from impstation/master
fad3302 
Upstream
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PJB3005 PJB3005 Awaiting requested review from PJB3005

@ZoldorfTheWizard ZoldorfTheWizard Awaiting requested review from ZoldorfTheWizard

Assignees

@Acruid Acruid

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Acruid @PJB3005 @ZoldorfTheWizard