08f3503a81
Update holder.dm
2017-10-05 05:14:27 -05:00
bb9982e772
Merge pull request #31296 from ShizCalev/landmark-cleanup
...
Cleans up and fixes old landmarks
2017-10-05 03:05:40 -05:00
cedb56af1b
Merge pull request #31302 from ninjanomnom/shuttle-rotation
...
Move shuttleRotate into the shuttle module
2017-10-05 03:05:32 -05:00
574e166951
Merge pull request #31269 from Firecage/doublehardsuitrebalance
...
Makes the ERT and Chronosuit hardsuits and helmets have the same armor stats.
2017-10-05 03:02:11 -05:00
4ecc019353
Moved admin music volume slider to its own menu ( #31277 )
...
* Moved admin music volume slider to its own menu
* Minor fixes to goonchat
2017-10-05 02:59:52 -05:00
d50c0e10f6
Makes shuttle movement a bit smoother and faster
2017-10-05 02:31:10 -05:00
fb7a0d7606
Experimental fix for bloom issue ( #31299 )
2017-10-04 23:25:06 -05:00
e6830cfec3
Merge pull request #3103 from Citadel-Station-13/upstream-merge-31222
...
[MIRROR] Ports dash weapons to the dash datum
2017-10-04 23:01:59 -04:00
d4cd519730
Merge pull request #3123 from Citadel-Station-13/upstream-merge-31276
...
[MIRROR] Moves laughter to the emote
2017-10-04 22:01:49 -04:00
09f6eb6156
Update preferences_savefile.dm
2017-10-04 20:53:42 -05:00
4c38a8b1e2
Update energy_katana.dm
2017-10-04 20:51:37 -05:00
365adf852c
Merge branch 'master' into upstream-merge-31222
2017-10-04 21:50:07 -04:00
63aa1c7153
Makes the pda font a prefernce
2017-10-04 19:28:57 -05:00
c873c17478
Merge pull request #31284 from tgstation/Cyberboss-patch-1
...
Code cleanup in snack_meats.dm
2017-10-04 19:27:47 -05:00
39cf9bb7a0
Merge pull request #31286 from KorPhaeron/ismachinery
...
ismachinery define
2017-10-04 19:26:38 -05:00
e5f5b427ba
Makes the energy katana swwwwwwish when drawn
2017-10-04 19:25:21 -05:00
5692228379
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-10-04 20:18:41 -04:00
5cefa71992
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-10-04 20:18:03 -04:00
42c59b67b5
Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed
2017-10-04 17:55:39 -05:00
3fdc29ba42
Merge pull request #3134 from Citadel-Station-13/upstream-merge-31283
...
[MIRROR] Fixes shaking people up while buckled into a bed/resin nest
2017-10-04 18:45:09 -04:00
9ee8b6298f
Merge pull request #3133 from Citadel-Station-13/upstream-merge-31275
...
[MIRROR] Adds deconstruction hints to various things
2017-10-04 18:44:50 -04:00
c2fe00cebd
Merge pull request #3132 from Citadel-Station-13/upstream-merge-31264
...
[MIRROR] Preliminary blast cannon cleanup
2017-10-04 18:44:38 -04:00
ecf44ff651
Merge pull request #3131 from Citadel-Station-13/upstream-merge-31150
...
[MIRROR] Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower
2017-10-04 18:44:21 -04:00
b217a804b6
Merge pull request #3130 from Citadel-Station-13/upstream-merge-31238
...
[MIRROR] Space vision fix V2.0 - GAME_PLANE change
2017-10-04 18:44:08 -04:00
4610a7a61d
Merge pull request #3128 from Citadel-Station-13/upstream-merge-31180
...
[MIRROR] removes carp piggyback exploit
2017-10-04 18:43:31 -04:00
e6ccc7077a
Merge pull request #3126 from Citadel-Station-13/upstream-merge-31279
...
[MIRROR] why plus a minus value and not just minus the value...
2017-10-04 18:43:04 -04:00
cfd98caf98
Update emote.dm
2017-10-04 17:42:38 -05:00
8c77408bb1
Merge pull request #3114 from Daniel0Mclovin/patch-2
...
Rebalanced pod people so they arnt as weak.
2017-10-04 18:42:02 -04:00
944c749dfc
Merge pull request #3117 from Citadel-Station-13/upstream-merge-31256
...
[MIRROR] Zombies regen toxin damage
2017-10-04 18:41:45 -04:00
6fe3f2a6b9
Merge pull request #3105 from Citadel-Station-13/upstream-merge-31125
...
[MIRROR] Fixes stealth nerf to detectives gun
2017-10-04 18:40:56 -04:00
929c737dfe
Fixes shaking people up while buckled into a bed/resin nest ( #31283 )
...
* Fixes shaking people up when buckled into bed
* CB
2017-10-04 17:01:27 -05:00
25cf971fef
Merge pull request #31275 from kingofkosmos/moredeconhints
...
Adds deconstruction hints to various things
2017-10-04 16:33:51 -05:00
d9d08ed57f
Preliminary blast cannon cleanup ( #31264 )
...
* Update blastcannon.dm
* Update blastcannon.dm
* Update blastcannon.dm
2017-10-04 16:32:41 -05:00
4d23dd56b8
Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower ( #31150 )
...
* Hides ninja socks, draining updated to DisplayPower
* CB
* KEEP_TOGETHER
2017-10-04 16:29:30 -05:00
77c422d011
Update emote.dm
2017-10-04 16:11:24 -05:00
c22f4a044d
Merge pull request #31238 from AnturK/specialeyes
...
Space vision fix V2.0 - GAME_PLANE change
2017-10-04 15:14:07 -05:00
9e59a29e35
Update projectile.dm ( #31180 )
2017-10-04 14:51:16 -05:00
1a3fc9f1c6
why plus a minus value and not just minus the value... ( #31279 )
...
* Update bullets.dm
* Update visuals_icons.dm
* Update asteroid.dm
2017-10-04 14:03:20 -05:00
441514937e
Moves laughter to the emote
2017-10-04 12:20:23 -05:00
282dcb3c16
Merge pull request #3121 from Citadel-Station-13/upstream-merge-31267
...
[MIRROR] Dummies used for preference setup always immediately compile their overlays
2017-10-04 12:29:21 -04:00
d8d75099e5
Merge pull request #3115 from Citadel-Station-13/upstream-merge-31241
...
[MIRROR] Makes gutlunches hungry for gibs again
2017-10-04 12:28:14 -04:00
4959746caf
Merge pull request #3113 from Citadel-Station-13/upstream-merge-31237
...
[MIRROR] Server tools API update to 3.1.0.1
2017-10-04 12:27:53 -04:00
cbf7ff0fc7
Dummies used for preference setup always compile overlays ( #31267 )
2017-10-04 11:03:47 -05:00
c03513b65d
Merge pull request #31256 from ShizCalev/zombie-toxin
...
Zombies regen toxin damage
2017-10-04 06:14:57 -05:00
cdc7695741
Makes gutlunches hungry for gibs again ( #31241 )
...
* gutlunch fix
* combine ifs, removes unneeded check
2017-10-04 04:11:33 -05:00
0515d2b754
Merge pull request #3110 from Citadel-Station-13/upstream-merge-31034
...
[MIRROR] Nightmare organs
2017-10-04 02:14:22 -04:00
05d9c9d3a2
Merge pull request #3104 from Citadel-Station-13/upstream-merge-31181
...
[MIRROR] Blobs now take damage from particle accelerators
2017-10-04 02:13:35 -04:00
315967bd15
Rebalanced pod people so they arnt as weak.
...
This will allow podpeople to regen at a steady pace without them being able to take tool boxes to the head like candy. it takes around 15 seconds to notably heal compared to the 40 it does just for a little bit and the 3 from before it was nerfed. The fact that podpeople need to go to the medbay to fix burn damage made me decide to make their brute regen stronger, not to mention that a single welder smach gives 18.75 damage and a shot to the leg with a laser carbine does 25 burn damage.
2017-10-03 23:10:50 -05:00
0830e6907e
Merge pull request #3093 from Kevak/Shock-Collars
...
Shock Collars Are Now A Thing.
2017-10-03 20:16:10 -04:00
454fb160a8
Merge pull request #3112 from Citadel-Station-13/upstream-merge-31188
...
[MIRROR] Gives nightmares a random shadowling name
2017-10-03 20:15:31 -04:00
LetterJay