Commit Graph

1254 Commits

Author SHA1 Message Date
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Dax Dupont
83c40d5fcc Fixes medbots not injecting from one tile away 2017-11-11 14:31:29 -06:00
LetterJay
fc04d94a29 Merge pull request #3870 from Citadel-Station-13/upstream-merge-32530
[MIRROR] Makes editing movements delay configs have an effect again
2017-11-11 12:37:59 -06:00
LetterJay
9071fde91b Merge pull request #3860 from Citadel-Station-13/upstream-merge-32515
[MIRROR] Process_Spacemove proc improvement
2017-11-11 12:36:35 -06:00
Jordan Brown
248d63fa3a Makes editing movements delay configs have an effect again (#32530) 2017-11-09 11:06:03 -06:00
LetterJay
e73fbd0a8e Update pirate.dm 2017-11-09 03:15:01 -06:00
LetterJay
1808943097 Update faithless.dm 2017-11-09 03:14:53 -06:00
Blute1
e6031b0d5c Process_Spacemove proc improvement 2017-11-08 19:51:57 -06:00
Leo
b48e8da861 Merge pull request #32442 from KorPhaeron/flyingrevert
Reverts flying mobs passing through people
2017-11-07 08:04:43 -06:00
LetterJay
787994ca3c Merge pull request #3840 from Citadel-Station-13/upstream-merge-32437
[MIRROR] Adds an organ storage bag to the syndicate medborg
2017-11-07 04:46:44 -06:00
Anonmare
9c12ee48e1 Adds an organ storage bag to the syndicate medborg (#32437)
* Adds an organ storage bag to the syndicate medborg

* Adds the drill and extinguisher
2017-11-06 15:15:10 -06:00
MoreRobustThanYou
1b1411f41f Monkeys can no longer transmit diseases through hardsuits (#32431) 2017-11-05 20:45:34 -06:00
LetterJay
39692c6134 Merge pull request #3790 from Citadel-Station-13/upstream-merge-32354
[MIRROR] Woody golems get woody names.
2017-11-04 22:47:34 -05:00
LetterJay
dd32227946 Merge pull request #3786 from Citadel-Station-13/upstream-merge-32346
[MIRROR] removes lesser drake crusher loot
2017-11-04 22:45:17 -05:00
Armhulen
056594114f Woody golems get woody names. (#32354)
* ya, that'll do em.

* we all make mistakes

* heat signature is a great game

* it's aliiiiive

* caving: the commit
2017-11-03 17:01:24 -05:00
imsxz
a509a99b52 crusher loot fix (#32346) 2017-11-03 15:54:44 -05:00
KorPhaeron
8f1d81f816 Dullahan Fixes (#32358)
* Dullahan

* Fixes cyborg issue

* Fixes hearing issues
2017-11-03 15:54:19 -05:00
LetterJay
02a0da9c38 Merge pull request #3765 from Citadel-Station-13/upstream-merge-31640
[MIRROR] [Ready]Ghosts can now Health Scan
2017-11-03 00:13:58 -05:00
LetterJay
e43e73c0c1 Merge pull request #3764 from Citadel-Station-13/upstream-merge-32243
[MIRROR] [s] New blob overminds off the station Z level are moved to the station
2017-11-03 00:13:37 -05:00
LetterJay
8006c60784 Merge pull request #3762 from Citadel-Station-13/upstream-merge-32284
[MIRROR] Fix a few syntactic aberrations
2017-11-03 00:13:00 -05:00
XDTM
d04b5cbeef Ghosts can now Health Scan (#31640)
* Ghosts can now Health Scan

* cyberbossing

* Update observer.dm
2017-11-02 08:46:42 -05:00
MoreRobustThanYou
07efcb0425 [s] New blob overminds off the station Z level are moved to the station (#32243)
* [s] New blob overminds are now placed at normal blob spawn points

* Update transform_procs.dm
2017-11-02 04:30:18 -05:00
Tad Hardesty
144df6c549 Fix a few syntactic aberrations (#32284) 2017-11-02 04:21:51 -05:00
MoreRobustThanYou
41893fc147 Spamming runes / battlecries / etc will no longer trigger spam prevention (#32303)
* Update say.dm

* Update runes.dm

* Update standard.dm

* Update ratvarian_language.dm
2017-11-02 04:13:18 -05:00
nicbn
8aef4f3b57 Rename brown gas to nitryl (#32271) 2017-11-01 21:37:20 -05:00
oranges
486982b422 Merge pull request #32145 from PKPenguin321/patch-16
Fixes a camera issue with scout holoparasites
2017-10-31 15:32:04 -05:00
LetterJay
6e4e0e4f2d Merge pull request #3709 from Citadel-Station-13/upstream-merge-32118
[MIRROR] actually fixes not being able to stop wagging your tail this time
2017-10-31 03:03:58 -04:00
LetterJay
59bea99c4b Merge pull request #3702 from Citadel-Station-13/upstream-merge-32123
[MIRROR] Removes statues from the gold slime pool
2017-10-31 03:01:34 -04:00
LetterJay
1092b020f4 Merge pull request #3690 from Citadel-Station-13/upstream-merge-32214
[MIRROR] Fixes old simple animal humanoid issues
2017-10-30 22:14:32 -04:00
LetterJay
6963ad2aac Merge pull request #3680 from Citadel-Station-13/upstream-merge-32041
[MIRROR] Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
2017-10-30 22:11:33 -04:00
LetterJay
49dce5c9ea Update emote.dm 2017-10-30 21:09:00 -05:00
LetterJay
ca1581bd11 Update emote.dm 2017-10-30 20:35:24 -05:00
kevinz000
93f39805e9 actually fixes not being able to stop wagging your tail this time 2017-10-30 15:24:38 -05:00
jughu
b6fea33316 Removes statues from the gold slime pool (#32123)
* Update statue.dm

* Update statue.dm
2017-10-30 14:53:56 -05:00
bawhoppen
f8bd9ecf9c Fixes old simple animal humanoid issues (#32214)
* fixes issue

* ignore that

* Spacebattle doesn't even open in DM

* Conflicts fixed for real

* Fixes pathing weirdness

* wonderful
2017-10-30 06:50:04 -05:00
LetterJay
48cc684de0 Update golems.dm 2017-10-29 22:41:23 -05:00
LetterJay
715a2fb918 Merge pull request #3677 from Citadel-Station-13/upstream-merge-32080
[MIRROR] Ice Spiders now use frost oil instead of toxin
2017-10-29 23:37:58 -04:00
LetterJay
2715fa9953 Merge pull request #3679 from Citadel-Station-13/upstream-merge-32174
[MIRROR] Halloween race fixes
2017-10-29 16:05:19 -04:00
Ashe Higgs
284b265a65 Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems 2017-10-29 13:57:10 -05:00
KorPhaeron
edfc86c895 Halloween race fixes 2017-10-29 12:31:38 -05:00
Armhulen
9c63e30e2f Ice Spiders now use frost oil instead of toxin (#32080)
* PARASTENG!!

* just monika
2017-10-29 11:02:50 -05:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
vuonojenmustaturska
53c9c16fe3 one more thing to allow more mobs to qdel nicely (#32168) 2017-10-29 07:14:44 -05:00
LetterJay
077e2a1598 Merge pull request #3655 from Citadel-Station-13/upstream-merge-32112
[MIRROR] "Mummies" (cloth golems) for Halloween
2017-10-29 04:20:28 -04:00
LetterJay
74a33169cb Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
LetterJay
3b91f4efcc Merge branch 'master' into upstream-merge-32096 2017-10-29 01:49:22 -04:00
LetterJay
debaad2948 Update podpeople.dm 2017-10-29 00:47:47 -05:00
LetterJay
d4e794eef7 Update furrypeople.dm 2017-10-29 00:47:25 -05:00
LetterJay
180e730be9 Update species.dm 2017-10-29 00:46:15 -05:00
LetterJay
78da30ec8d Update species.dm 2017-10-29 00:25:17 -05:00