shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,310 Commits 5 Branches 0 Tags
acc75bfb5ff37bc595f5df79e4bbd9b369fc516e
Commit Graph

286 Commits

Author SHA1 Message Date
LetterJay
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay
ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
CitadelStationBot
3d83b55cf6 Annihilates the colons! 2017-08-15 10:49:55 -05:00
LetterJay
69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
LetterJay
f1872a8bae Merge pull request #2231 from Citadel-Station-13/upstream-merge-29615 
[MIRROR] Action buttons for spells now include their description
 2017-08-14 08:56:19 -05:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
CitadelStationBot
e972a90ba9 Adds callback select system 2017-08-13 01:27:51 -05:00
ktccd
62a7d4301f Refactored flavortext. 
Flavortext is now stored in DNA features and can thus be stolen by
changelings and restored by cloners/pods/etc.
Also added genitals_use_skintone to the random features proc, 'cause it
was missing (my bad, I was even newer at messing with DNA back then :S).
 2017-08-11 20:13:01 +02:00
LetterJay
9a7d9e6413 Merge pull request #2309 from ktccd/Arousal-clone-fix 
Makes mindtransfers respect arousal
 2017-08-09 02:22:02 -05:00
CitadelStationBot
cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
ktccd
c0cc428216 Makes mindtransfers respect arousal 
Clients arousal preferences are now taken into account when transferring
minds.
 2017-08-08 19:45:06 +02:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
90a7ead961 [MIRROR] The AI's internal camera functions better (#2219) 
* The AI's internal camera functions better

* sync robot.dm and hopefully not break shit
 2017-08-05 10:24:58 -07:00
ktccd
cf39768f25 Fixes cloning and DNA change losing genitals. (#2242) 
Fixes cloning and DNA change losing genitals.
Any hardsynch to TG removes this, because I can't freaking do the
complicated multiple-of-same-proc thing that the TG head-coders know...
 2017-08-04 08:43:27 -07:00
CitadelStationBot
8267e1ad25 Fixes missing objectives and antag status. (#2244) 2017-08-04 08:42:55 -07:00
CitadelStationBot
ab66dc57fe Allows Ninja Adrenaline Boost to be used while stunned. (#2251) 2017-08-04 08:42:03 -07:00
CitadelStationBot
ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00
kevinz000
0ec200f540 Delete action.dm.rej 2017-08-03 06:11:26 -07:00
kevinz000
489840752f Merge branch 'master' into upstream-merge-29615 2017-08-03 06:11:11 -07:00
CitadelStationBot
1b22c5fe0c [MIRROR] Separates actions.dmi into multiple files (#2214) 
* Separates actions.dmi into multiple files

* Delete beam_rifle.dm.rej

* Delete action.dm.rej
 2017-08-03 06:09:39 -07:00
CitadelStationBot
6cd0855b5a Unifies datum var definitions (#2237) 2017-08-03 06:02:58 -07:00
CitadelStationBot
87b56c9d9c Testmerged [s] PRs no longer shown to non-admins (#2220) 2017-08-03 06:02:37 -07:00
CitadelStationBot
36029ea7cb Fixes explosion_block being inconsistent (#2236) 2017-08-03 06:00:35 -07:00
CitadelStationBot
89e29a036c Action buttons for spells now include their description 2017-08-02 08:52:47 -05:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
CitadelStationBot
8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162) 
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
 2017-08-02 04:56:44 -05:00
LetterJay
0392f761d0 Merge pull request #2117 from Citadel-Station-13/upstream-merge-29324 
[MIRROR] DCS Continued
 2017-08-01 23:55:14 -05:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
kevinz000
bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
ktccd
4c7f288341 Adds a HUD for borers (#2211) 
Borers with minds are added to the HUD and can see the HUD.
Humans with a borer are added to the HUD, but CANNOT see the HUD.
If the borer leaves, the human is removed from the HUD.
 2017-07-31 21:45:00 -07:00
LetterJay
29f8f8eb45 Update component.dm 2017-07-31 23:36:49 -05:00
CitadelStationBot
3d53f888b1 Improves several Sound Loops' Performance 2017-07-31 14:35:16 -05:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
CitadelStationBot
79e6963aca Hallucinations 3.0 2017-07-30 19:58:28 -05:00
CitadelStationBot
5da5e58ee5 Fixes a lot of eye damage procs 2017-07-30 08:16:38 -05:00
CitadelStationBot
a1c41c461a Ashstorms Matryoshka bugfix (#2167) 2017-07-28 16:50:53 -07:00
CitadelStationBot
53dc265b94 Fixes virology timing in a better way (#2124) 2017-07-27 05:30:43 -07:00
ktccd
c52f7a0475 Delayed objective (#2140) 
Delayed objective [Latejoiners can now be selected as traitor targets]
 2017-07-27 05:27:58 -07:00
CitadelStationBot
147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
LetterJay
51846b1efd Merge pull request #2122 from Citadel-Station-13/upstream-merge-29485 
[MIRROR] Map Spellcheck
 2017-07-25 12:56:27 -05:00
CitadelStationBot
b998e14a5b Map Spellcheck 2017-07-24 21:16:46 -05:00
CitadelStationBot
d7e66b7a3a You can now control-click action buttons to lock them in place 2017-07-24 17:05:41 -05:00
CitadelStationBot
50adcbb302 DCS Continued 2017-07-24 16:45:14 -05:00
CitadelStationBot
7ce6be92a0 Virology fixes (#2097) 2017-07-24 04:08:07 -07:00
CitadelStationBot
bfcb068f21 Adds proper containers for some locates (#2080) 2017-07-20 06:31:25 -07:00
LetterJay
7b15a20022 Merge pull request #2038 from Citadel-Station-13/upstream-merge-29178 
[MIRROR] Ports /vg/'s datum component system
 2017-07-19 13:41:00 -05:00
LetterJay
22ed4d63b9 Rename code/datums/component/components.dm to code/datums/components/component.dm 2017-07-19 13:22:20 -05:00
LetterJay
6050c5a881 Rename code/datums/components.dm to code/datums/component/components.dm 2017-07-19 13:21:11 -05:00
LetterJay
85f1b25bcd Merge pull request #1986 from Citadel-Station-13/upstream-merge-28556 
[MIRROR] [Seriously, it's ready]Virology Rework: The Thresholdening
 2017-07-19 06:29:06 -05:00
LetterJay
92e967d904 Update vomit.dm 2017-07-19 05:15:51 -05:00