Commit Graph

3732 Commits

Author SHA1 Message Date
deathride58
4eceef7693 Merge pull request #4155 from Citadel-Station-13/upstream-merge-32967
[MIRROR] Added bot path data huds
2017-11-30 04:34:25 +00:00
deathride58
0e77256e81 Merge pull request #4163 from Citadel-Station-13/upstream-merge-33138
[MIRROR] Fixes piano in the big band music crate
2017-11-29 03:28:53 +00:00
deathride58
7a5a02939c Merge pull request #4162 from Citadel-Station-13/upstream-merge-33131
[MIRROR] Makes the sloth an actual sloth
2017-11-29 03:28:04 +00:00
deathride58
5e2ca3235d Merge pull request #4160 from Citadel-Station-13/upstream-merge-33112
[MIRROR] Fixes devilstuff
2017-11-29 03:26:51 +00:00
deathride58
5fdba02717 Merge pull request #4156 from Citadel-Station-13/upstream-merge-33126
[MIRROR] Fixes projectiles not getting range on ricochets
2017-11-29 03:25:18 +00:00
deathride58
507c862c7c Update hud.dm 2017-11-28 22:24:00 -05:00
deathride58
4ff2063a4a Update sloth.dm 2017-11-28 22:19:08 -05:00
ShizCalev
48c66093fc Fixes big band music crate (#33138) 2017-11-28 19:02:54 -06:00
Kyle Spier-Swenson
ad135a57a3 Makes the sloth an actual sloth 2017-11-28 19:02:45 -06:00
Jordan Brown
87c16e3939 Merge pull request #33112 from AnturK/devilfix
Fixes devilstuff
2017-11-28 06:29:25 -06:00
kevinz000
9c93d8ef4c fixes ricochets not resetting range 2017-11-28 06:28:47 -06:00
Cruix
b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
ACCount
d883ec3114 Moves pipe meter sprites (#33122) 2017-11-28 06:28:31 -06:00
deathride58
e0aaed6d3b Merge pull request #4148 from Citadel-Station-13/upstream-merge-33086
[MIRROR] Fixed a rare custom shuttle docker client crash
2017-11-27 20:40:36 +00:00
Cruix
e9f307af8e Fixed a rare custom shuttle docker client crash (#33086) 2017-11-27 11:46:32 -06:00
vuonojenmustaturska
f685f4bd1a Removes one source of decal/cleanable qdel failures (#33083)
* remove one source of qdel memes

* pls

* A housekeeping thing for the ignore list, also removes effectively unused var

* whoops
2017-11-27 05:30:08 -06:00
deathride58
952c25ff6e Merge pull request #4128 from Citadel-Station-13/upstream-merge-33065
[MIRROR] Fixes rdconsole emagging
2017-11-27 05:19:49 +00:00
deathride58
2e708d49c2 Merge pull request #4123 from Citadel-Station-13/upstream-merge-32993
[MIRROR] A few investigate_log and message_admin fixes
2017-11-27 05:18:12 +00:00
deathride58
9e0aac69f3 Merge pull request #4136 from Citadel-Station-13/upstream-merge-33034
[MIRROR] More integrated circuit fixes and code improvements
2017-11-27 05:17:50 +00:00
deathride58
1d8618eaca Merge pull request #4139 from Citadel-Station-13/upstream-merge-33090
[MIRROR] Cleans up goldcore defines
2017-11-27 03:11:42 +00:00
deathride58
424ba669f1 Update protolathe.dm 2017-11-26 21:40:14 -05:00
deathride58
90691c68d0 Update rdconsole.dm 2017-11-26 21:39:40 -05:00
deathride58
61521990e2 Update circuitprinter.dm 2017-11-26 21:39:11 -05:00
deathride58
c4b3b99c99 Merge pull request #4141 from Citadel-Station-13/upstream-merge-33087
[MIRROR] Cleans up some qdel(src)'s in Initialize()
2017-11-27 02:37:07 +00:00
deathride58
c9f0f4923f Update rdconsole.dm 2017-11-26 21:34:09 -05:00
deathride58
d5eef89e13 Update parrot.dm 2017-11-26 21:26:35 -05:00
deathride58
12cb0a98a4 Update headcrab.dm 2017-11-26 21:25:51 -05:00
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
ShizCalev
5abd1bcdd9 Cleans up some qdel(src)'s in Initialize() 2017-11-26 20:15:18 -06:00
ShizCalev
4a22fed89d Cleans up goldcore defines 2017-11-26 16:51:44 -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
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
5368aed6d5 Merge pull request #4129 from Citadel-Station-13/upstream-merge-33002
[MIRROR] Butterdogs
2017-11-26 02:16:03 +00: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
kevinz000
606f403c5b Fixes cryo rotation (#32992) 2017-11-25 13:27:38 -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
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