Commit Graph

301 Commits

Author SHA1 Message Date
LetterJay
dfd5c7465b Merge pull request #2246 from Citadel-Station-13/upstream-merge-29647
[MIRROR] Fixes SendSignal()
2017-08-21 21:50:39 -05:00
LetterJay
259edee5a2 Update component.dm 2017-08-21 18:49:14 -05:00
LetterJay
17c0c4ba79 FUCK 2017-08-21 18:39:30 -05:00
LetterJay
39a69c2a28 Update component.dm 2017-08-21 16:50:29 -05:00
LetterJay
ab26b486b7 Update component.dm 2017-08-21 02:38:51 -05:00
CitadelStationBot
c17ca3001f Diseases will properly make new symptoms instead of sharing the same for everyone 2017-08-19 18:41:34 -05:00
LetterJay
46e7d7a9c4 Merge branch 'master' into upstream-merge-29647 2017-08-19 12:25:49 -05:00
CitadelStationBot
45d6ece7a8 Adds a warning to the traitor panel for the last headrev 2017-08-18 18:57:53 -05:00
LetterJay
85a10be496 Merge pull request #2221 from Citadel-Station-13/upstream-merge-29523
[MIRROR] Makes GetComponent() faster using typecache magic
2017-08-18 14:16:44 -05:00
LetterJay
2c33ef3ab0 Update component.dm 2017-08-18 13:56:47 -05:00
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
fa8ed2de17 Update component.dm 2017-08-14 09:13:33 -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
LetterJay
bfbc3e198c Merge branch 'master' into upstream-merge-29523 2017-08-14 08:30:40 -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
CitadelStationBot
3e96c59bb7 Fixes SendSignal() 2017-08-03 13:15:13 -05: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
LetterJay
468b14a011 Update component.dm 2017-08-02 06:04:43 -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
a2e487c86e Makes GetComponent() faster using typecache magic 2017-08-01 16:59:50 -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