tigercat2000
dbc3d17cc5
Merge pull request #9857 from Agameofscones/ID_Sticker_Redux
...
ID_Decal Sprites
2018-10-18 11:26:59 -07:00
Mark Mak
35591ad940
Merge pull request #9889 from Squirgenheimer/cryoruntimefix
...
adds sanity check to show_to for storage items
2018-10-18 08:54:08 +08:00
Squirgenheimer
9280f9f9bd
adds sanity check to show_to for storage items
2018-10-17 18:33:50 -04:00
Mark Mak
13d95c04e2
Merge pull request #9875 from lass9030/add-to-locker
...
Add uniform to blueshield locker
2018-10-17 21:36:11 +08:00
Mark Mak
b418ee8401
Merge pull request #9828 from datlo/honkinfiltrationkit
...
Adds the Honk Brand Infiltration Kit
2018-10-17 21:35:06 +08:00
lass9030
6776bdb242
add uniform to blueshield locker
2018-10-17 01:19:58 +02:00
Mark Mak
a89f886a37
Merge pull request #9858 from Ty-Omaha/stunbaton-runtime
...
Fixes stunbaton runtime
2018-10-15 13:17:30 +08:00
Ty-Omaha
2862503d2b
stunbaton runtime comment
2018-10-15 01:01:39 -04:00
Ty-Omaha
adbf0bb2cc
stunbaton runtime fix
2018-10-15 00:54:17 -04:00
Gwydion Brain
d7ecb3bd8c
Typo
2018-10-14 21:12:42 -07:00
Gwydion Brain
812c142fe9
Lil fixo
2018-10-14 21:06:37 -07:00
Gwydion Brain
09313bbea1
Initial
2018-10-14 21:04:12 -07:00
tigercat2000
315491786a
Merge pull request #9838 from variableundefined/OreStackQOL
...
CtrlShiftClick for stack
2018-10-14 07:19:38 -07:00
Purpose
d11a0ac95b
visibility
2018-10-14 11:52:09 +01:00
variableundefined
b097b06b72
CtrlShiftClick for stack
2018-10-13 23:04:50 +08:00
datlo
ac5cc480b9
Adds the Honk Brand Infiltration Kit
...
Also adds the clown mask voice changer as part of the kit
2018-10-12 17:02:55 +01:00
variableundefined
96f5046f19
Merge pull request #9817 from SamHPurp/stool-bed-chair-fixes
...
A few fixes
2018-10-12 13:48:02 +08:00
variableundefined
376cdc709a
Merge pull request #9818 from farie82/twohanded-fix
...
Fixes the giving of required two handed items and chainsaw stuf
2018-10-12 13:24:19 +08:00
variableundefined
4de5284557
Merge pull request #9677 from DesolateG/global
...
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
tigercat2000
98c77fc466
Merge pull request #9343 from variableundefined/OreTGPort
...
Port over tg ore stack and stack merging
2018-10-11 19:34:13 -07:00
variableundefined
108ebfed3a
Formatting improvement
2018-10-12 07:57:58 +08:00
Purpose
6c6d35d133
fixies
2018-10-11 22:02:23 +01:00
joep van der velden
c96adec91f
Fixed it
2018-10-11 22:55:10 +02:00
Desolate
f7627d2fcb
Resolves conflicts.
2018-10-11 05:36:22 -05:00
Purpose
9ee4347965
conflicts? apparently?
2018-10-10 18:53:22 +01:00
variableundefined
f23b3ae178
Merge pull request #9793 from Citinited/emag-locker-fix
...
Removes redundancy in emagged locker description
2018-10-10 08:02:32 +08:00
Citinited
8b5df00759
Removes recundancy in emagged locker description
2018-10-09 21:46:38 +01:00
lass9030
8111331094
Replaced code with procs, added return values.
2018-10-09 16:21:11 +02:00
variableundefined
6b1b38d4f1
Port over tg ore stack and stack merging
...
Meta
Birbfix
Maxi
Re-add automatic satchel ore pickup (oops)
Mecha formatting
re
2018-10-09 10:06:03 +08:00
variableundefined
c2bf480622
Merge pull request #9631 from Birdtalon/ERT-changes
...
Gamma ERT Changes
2018-10-09 08:58:15 +08:00
Purpose
4d7dd5a6c9
dayum dats defined
2018-10-08 22:48:00 +01:00
Crazy Lemon
916e0d9a72
Merge pull request #9415 from variableundefined/SpeshulGunlog
...
Minor attack log overhaul
2018-10-08 01:16:21 -07:00
Crazy Lemon
c068680651
Merge pull request #9658 from variableundefined/DunGoofGrille
...
Change grille cooldown to 1 second instead
2018-10-08 01:08:19 -07:00
variableundefined
bc4a042d57
Merge pull request #9546 from SamHPurp/oh-come-on,-who-throws-a-baton,-i-mean-really
...
Thrown Stunbatons have a low chance to stun
2018-10-08 15:06:54 +08:00
variableundefined
042d24520e
Merge pull request #9724 from SamHPurp/plasma-window-spawners
...
Adds plasma window spawners
2018-10-08 12:20:20 +08:00
Crazylemon64
3db4229918
First big chunk of the refactor
...
mid-refactor of `take_overall_damage`
Fully refactors the (?:take|heal)_(?:overall|organ)_damage procs
Allows the dead to examine
Removes the `blinded` var
Refactor cyborg components so vision loss is instant
Robot life/death updates instantly
Adds instant updates for damage overlays and HUD icons for humans
Final reconciliation with the species refactor
Adds a stat debugging system and debugging logs
Also fixes instant death on species change
"Debugging logs" are used for stuff an admin wouldn't care about but
someone debugging would
I used it to fix people dying instantly when changing species due to
temporary deletion of the brain
Fox's requests
Adds a more careful updating system to our reagents system
2018-10-07 17:52:04 -07:00
Birdtalon
074ee967e5
Merge branch 'master' into ERT-changes
2018-10-07 19:22:10 +01:00
Birdtalon
4151487c98
bugfixes
2018-10-07 18:49:48 +01:00
Purpose
b28527f992
Merge branch 'master' into dirt-smoothing
2018-10-07 17:16:54 +01:00
variableundefined
988beeb462
Merge pull request #9730 from SamHPurp/decal-tidy-up
...
Refactors decals
2018-10-07 23:09:05 +08:00
variableundefined
3c98bf5799
Merge pull request #9710 from SamHPurp/de-specifying
...
Reduces incorrect use of station names.
2018-10-07 22:52:27 +08:00
Purpose
eeed299b86
tidyup
2018-10-07 12:43:37 +01:00
tigercat2000
d4d340ddf8
Merge pull request #9721 from SamHPurp/damnit-chairs
...
Fixes incorrect chair assignment
2018-10-06 16:50:21 -07:00
Purpose
3411d92642
adds the plasma window spawners
2018-10-07 00:15:18 +01:00
SkeletalElite
9912529ab7
Grammar Fix
...
"a meat spike" resulted in weird stuff like "a meat spike is hit by the laser!"
2018-10-06 15:39:04 -07:00
Purpose
50c393f78a
missed a chair declaration
2018-10-06 22:53:34 +01:00
Purpose
b9d2f0a915
Revert this commit when using subsystem.
2018-10-06 21:54:38 +01:00
Purpose
a472eee850
dirt smoothing
2018-10-06 19:22:20 +01:00
Purpose
3b50aad95d
oh lets not pick up wheelchairs either
2018-10-06 16:47:06 +01:00
Purpose
63dfd411aa
Resolved merge conflicts... I hope.
2018-10-06 16:01:34 +01:00
