Commit Graph

6749 Commits

Author SHA1 Message Date
deathride58
90e13d0053 Update creature.dm 2017-11-26 21:25:13 -05:00
deathride58
e5e17cf334 Update bear.dm 2017-11-26 21:24:27 -05:00
deathride58
c67063beb5 Update lizard.dm 2017-11-26 21:23:50 -05:00
deathride58
e70daa585c Update fox.dm 2017-11-26 21:23:26 -05:00
deathride58
eb13f4ee2f Update farm_animals.dm 2017-11-26 21:22:42 -05:00
deathride58
933b4a7a3a Update crab.dm 2017-11-26 21:21:55 -05:00
deathride58
4e2db63a33 Update cat.dm 2017-11-26 21:21:28 -05:00
deathride58
59b8731370 Update misc.dm 2017-11-26 21:20:54 -05:00
deathride58
9538aa645c Update bombspawner.dm 2017-11-26 21:20:00 -05:00
deathride58
540a4eac5d Merge pull request #4140 from Citadel-Station-13/upstream-merge-33088
[MIRROR] Fixes wizard greentext
2017-11-27 02:19:02 +00:00
deathride58
d765fc49e7 Merge pull request #4135 from Citadel-Station-13/upstream-merge-33080
[MIRROR] Oldstation edits/fixes
2017-11-27 02:18:47 +00:00
ShizCalev
5abd1bcdd9 Cleans up some qdel(src)'s in Initialize() 2017-11-26 20:15:18 -06:00
AnturK
c574b06f90 Fixes wizard greentext (#33088) 2017-11-26 16:53:58 -06:00
ShizCalev
4a22fed89d Cleans up goldcore defines 2017-11-26 16:51:44 -06:00
Ashe Higgs
6c553d17a4 Splits mutations from mutations.dm into a subfolder, /datums/mutations 2017-11-26 14:54:13 -06:00
kevinz000
794a793b27 Fixes latejoins (#33096)
length() is 0 on null lists.

Update job.dm
2017-11-26 05:11:09 -06:00
ACCount
0be326633d More integrated circuit fixes and code improvements 2017-11-26 04:56:44 -06:00
Mark9013100
fb4787fbd1 Oldstation edits/fixes (#33080) 2017-11-26 00:01:21 -06:00
deathride58
d3b3c54e70 Merge pull request #4119 from Citadel-Station-13/upstream-merge-33053
[MIRROR] Adds null checks to uplink item generation for ssticker mode, so spawned uplinks work pre-game
2017-11-26 02:19:34 +00:00
deathride58
b6a51532ed Merge pull request #4111 from Citadel-Station-13/upstream-merge-32984
[MIRROR] Fixes thermite burning lava
2017-11-26 02:19:15 +00:00
deathride58
be89f4d7dd Merge pull request #4116 from Citadel-Station-13/upstream-merge-32940
[MIRROR] Advanced Laserpointer Feline Interaction
2017-11-26 02:18:56 +00:00
deathride58
b32f24113a Merge pull request #4131 from Citadel-Station-13/upstream-merge-33075
[MIRROR] Adds spawn override system
2017-11-26 02:18:24 +00:00
deathride58
5368aed6d5 Merge pull request #4129 from Citadel-Station-13/upstream-merge-33002
[MIRROR] Butterdogs
2017-11-26 02:16:03 +00:00
deathride58
c6f879ee51 Merge pull request #4127 from Citadel-Station-13/upstream-merge-33073
[MIRROR] Implanted cultists can now be elected as master without being perma-deculted
2017-11-26 02:15:27 +00:00
deathride58
ff77f397ff Merge pull request #4126 from Citadel-Station-13/upstream-merge-32992
[MIRROR] Fixes cryocells not properly disconnecting and reconnecting/switching piping directions after wrench rotation.
2017-11-26 02:14:56 +00:00
deathride58
d660b6a2a8 Merge pull request #4125 from Citadel-Station-13/upstream-merge-33005
[MIRROR] Maybe fixes meson hearing exploit
2017-11-26 02:14:02 +00:00
XDTM
7a5af2f237 [Super-Ready for review]Reworks healing symptoms into conditional healing symptoms 2017-11-25 18:54:33 -06:00
Jordan Brown
20014e6f44 Merge pull request #33075 from AnturK/itsnotabusewhenitsassistants
Adds spawn override system
2017-11-25 16:37:46 -06:00
Emmett Gaines
8c11252d93 butterdogs (#33002) 2017-11-25 15:35:21 -06:00
kevinz000
437c527fd2 Fixes rdconsole emagging 2017-11-25 15:17:52 -06:00
MoreRobustThanYou
8f23eeb003 Fix #32755 (#33073) 2017-11-25 15:17:42 -06:00
kevinz000
606f403c5b Fixes cryo rotation (#32992) 2017-11-25 13:27:38 -06:00
vuonojenmustaturska
744a78e932 Maybe fixes meson hearing exploit (#33005)
* Not all of wisdom brings joy

* Serves me right for making changes based on how i remember the code working
2017-11-25 13:25:24 -06:00
WJohn
237f0fa8db Lowers rack layer to 2.8 (#33069) 2017-11-25 09:21:02 -06:00
deathride58
14ce7c8118 Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994
[MIRROR] Updates some item drops to use drop_location()
2017-11-25 05:53:16 +00:00
deathride58
6442a3a751 Update uplink_item.dm 2017-11-25 00:50:45 -05:00
deathride58
5636f01831 Merge pull request #4122 from Citadel-Station-13/upstream-merge-33058
[MIRROR] pais can no longer buckle to objects, and buckle others to objects
2017-11-25 05:49:37 +00:00
deathride58
55089be2b5 Merge pull request #4121 from Citadel-Station-13/upstream-merge-33049
[MIRROR] fix zombie reanimation
2017-11-25 05:49:23 +00:00
deathride58
abc62818d3 Merge pull request #4120 from Citadel-Station-13/upstream-merge-33056
[MIRROR] robotics console desc change
2017-11-25 05:49:07 +00:00
deathride58
6a49f6f939 Merge pull request #4118 from Citadel-Station-13/upstream-merge-33048
[MIRROR] Cleans up a double assignment
2017-11-25 05:48:50 +00:00
Jordie
4053499c83 A few investigate_log and message_admin fixes 2017-11-24 22:42:01 -06:00
Armhulen
ceee0c80e7 okay (#33058) 2017-11-24 22:39:44 -06:00
checkraisefold
c6a68bad83 fix zombie reanimation (#33049)
lol
2017-11-24 22:36:30 -06:00
Armhulen
d9c650970c making prs isn't even worth it anymore (#33056) 2017-11-24 22:36:22 -06:00
kevinz000
9bb564a138 Adds null checks to uplink item generation for ssticker mode, so spawned uplinks work pre-game 2017-11-24 22:34:09 -06:00
Y0SH1M4S73R
86fca33d06 Cleans up a double assignment (#33048)
* Fixes component runtimes (#33045)

* fixes an internally redundant assignment statement
2017-11-24 22:29:53 -06:00
Tad Hardesty
d52d546463 Deny buckling when the user is inside lockers, mechs, etc. (#33015) 2017-11-24 22:29:40 -06:00
deathride58
186bcf6ef4 Update laserpointer.dm 2017-11-24 19:03:25 -05:00
Dorsisdwarf
6dea43c709 Advanced Laserpointer Feline Interaction 2017-11-24 17:56:58 -06:00
deathride58
cf053af319 Update pandemic.dm 2017-11-24 18:50:23 -05:00