Commit Graph

1784 Commits

Author SHA1 Message Date
CitadelStationBot
1e65c813f0 [MIRROR] Extensive surgery additions (#5590)
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
Poojawa
97f69d6b05 Stop the fucking posibrain pinging, christ (#5584) 2018-02-19 01:04:15 -06:00
deathride58
9bb0f20467 Merge pull request #5570 from Citadel-Station-13/upstream-merge-35738
[MIRROR] MMIs can now whisper without talking on the radio
2018-02-18 23:31:00 +00:00
coiax
78803f01a6 MMIs can now whisper without talking on the radio (#35738)
* MMIs can now whisper without talking on the radio

Fixes #35638.

* Otherwise, call super
2018-02-18 11:34:12 -06:00
Poojawa
d154a302e1 Sergals don't actually have an extra snout layer 2018-02-18 06:49:30 -06:00
Poojawa
d2d1315b13 fixes shepards, adjusts fox markings 2018-02-18 06:41:14 -06:00
Poojawa
3255bfbdbf sergal head stuffs
husky markings too
2018-02-18 04:48:02 -06:00
deathride58
f072def90e Merge pull request #5533 from Citadel-Station-13/upstream-merge-35673
[MIRROR] All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals.
2018-02-17 20:44:57 +00:00
deathride58
fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668
[MIRROR] Quote the armor lists
2018-02-17 19:29:50 +00:00
LetterJay
e809725afd Merge pull request #5525 from jakeramsay007/slimepeoplerework
[Ready!] The Slimening - Reworking slimepeople to be less like humans without unbalanced advantages.
2018-02-17 11:51:45 -06:00
LetterJay
3c8fd612a0 Merge pull request #5547 from Citadel-Station-13/upstream-merge-35722
[MIRROR] Fixes extremely thicc robots
2018-02-17 11:49:15 -06:00
Dax Dupont
d368c42a98 Fixes extremely thicc robots (#35722)
* Fixes extremely fat robots

* grasp
2018-02-17 10:13:08 -06:00
vuonojenmustaturska
cec7acc0ea Merge pull request #35725 from jakeramsay007/slimepeoplefixes
Jellypeople (and all subtypes) now can actually speak Slime, as intended
2018-02-17 10:05:47 -06:00
Chayse Ramsay
29bdef8664 New UI icon 2018-02-16 21:14:55 +00:00
Leo
a5650cccc4 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals. 2018-02-16 12:18:21 -06:00
AnturK
3e12e1b2f6 Some antag fixes. (#35690)
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
2018-02-16 10:35:55 -06:00
Chayse Ramsay
47e9b2fe63 More Requested Changes 2018-02-16 15:52:28 +00:00
Chayse Ramsay
7565f1e1f1 Undoing what should be an upstream fix 2018-02-16 15:36:20 +00:00
Chayse Ramsay
a8dcbd0dd4 Gives Jellypeople and subtypes the ability to actually SPEAK slime, not just understand it. Upstream oversight corrected. 2018-02-16 15:26:00 +00:00
Chayse Ramsay
e040e5523f Requested Changes Part 1 2018-02-16 15:14:31 +00:00
Chayse Ramsay
b233e05bfe Altering coldmod to make it a little less ridiculous. Now back the original value but with no heat or burn protection. 2018-02-16 15:06:13 +00:00
Chayse Ramsay
f66931142c More corrections 2018-02-16 12:49:47 +00:00
Chayse Ramsay
665a7f0a4b Correcting the roundstart slimeperson heat and burn mod 2018-02-16 12:47:49 +00:00
Chayse Ramsay
28e7e980d7 Correcting a species_traits flag issue 2018-02-16 12:46:56 +00:00
Chayse Ramsay
482c21b296 Slimepeople Rework 2018-02-16 12:44:23 +00:00
vuonojenmustaturska
6dfa89fab7 Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement (#35679)
* honk

* qdel memes
2018-02-16 00:41:04 -06:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
deathride58
c1b3253b8d Merge pull request #5485 from Poojawa/cryopods
Cryopods from Oracle Station
2018-02-16 05:56:34 +00:00
LetterJay
14d387fa04 Merge pull request #5513 from Citadel-Station-13/upstream-merge-35542
[MIRROR] Cleans up some duplicate canusetopic warnings
2018-02-15 22:17:54 -06:00
oranges
5dc3549801 Merge pull request #35542 from ShizCalev/free-spam-removal
Cleans up some duplicate canusetopic warnings
2018-02-15 20:35:03 -06:00
deathride58
e873fce53f Update laws.dm 2018-02-15 20:28:05 -05:00
AnturK
10a40524ab Cleans up remnant traitor cyborg code and AI hacking. 2018-02-15 10:40:04 -06:00
Poojawa
01bc7310b6 Cryopods from Oracle Station
It's really nice to have a tg based station that's porting good shit.
2018-02-14 14:06:33 -06:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
deathride58
aa3ee6b6e2 Merge pull request #5475 from Citadel-Station-13/upstream-merge-35605
[MIRROR] Fixes ai transform being picky
2018-02-14 03:34:13 +00:00
Jordan Brown
807a2ebaeb Merge pull request #35605 from MrStonedOne/patch-481
Fixes ai transform being picky
2018-02-13 21:00:05 -06:00
Jordan Brown
da5cc6a8cc Merge pull request #35618 from YPOQ/processdeaddiseasefix
Fixes process_dead diseases not processing at all
2018-02-13 20:58:48 -06:00
ShizCalev
833a700cbb Fixes invalid throwat args (#35565) 2018-02-13 07:14:47 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
Robustin
1825c944b6 Cult Update? Cult Update! (#35433)
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
2018-02-12 15:18:21 -06:00
Jordan Brown
e2b4e3c567 Fixes wrong ID for syndicate ghost roles 2018-02-11 15:35:14 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
deathride58
a34dc0b90b Update personality.dm 2018-02-10 19:51:21 -05:00
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
deathride58
832ac9a64a makes emote input text boxes larger 2018-02-08 21:47:29 -05:00
vuonojenmustaturska
56369b7f99 Fixes geiger counters on engiborgs (#35423)
* a commit

* Update geiger_counter.dm
2018-02-08 11:21:27 -06:00
Jordan Brown
28fe3df885 Merge pull request #35410 from ShizCalev/ai-loc-fix
Fixes primary AI spawning at incorrect locations
2018-02-08 09:06:14 -06:00
LetterJay
e548295398 Merge pull request #5367 from Citadel-Station-13/upstream-merge-35346
[MIRROR] Fixes cyborg related cuffing issues
2018-02-08 07:11:52 -06:00
oranges
d427e0174b Merge pull request #35346 from DaxDupont/kinky-cuffs
Fixes cyborg related cuffing issues
2018-02-08 03:07:51 -06:00
MoreRobustThanYou
9c957f5a0b Heart Disease 2: Electric Boogaloo (#35296)
* Heart Disease 2: Electric Boogaloo

* Upd8
2018-02-08 03:02:29 -06:00