Commit Graph

26370 Commits

Author SHA1 Message Date
kappa-sama 6cd9993e50 5 2020-07-17 15:54:45 -04:00
silicons 329ba4d823 Update gas_mixture.dm 2020-07-17 12:53:43 -07:00
silicons a2c3643e20 fix 2020-07-17 12:46:32 -07:00
Lin 76c6c767d9 Merge pull request #12784 from silicons/shields
fixes active block toggle not existing
2020-07-17 14:43:40 -05:00
SiliconMain 82e0a3b66b Update geiger_counter.dm 2020-07-17 14:32:46 -05:00
Artur 73a758adc8 Decal Painter fix 2020-07-17 22:05:46 +03:00
silicons cc6079d413 Update human_movement.dm 2020-07-17 09:10:03 -07:00
silicons 813fd9b3e0 Update shields.dm 2020-07-17 09:00:02 -07:00
BlackMajor 9b671b7dd1 I'm gonna regret this. Adds stock parts (meaning cells) to the gripper list 2020-07-18 03:08:52 +12:00
TheSpaghetti b2e9579217 Fixes typos in the light sensitivity trait.
It was bothering me.
2020-07-17 00:48:45 -04:00
BlackMajor eb9b3da581 Blacklist logic fix 2020-07-17 16:13:18 +12:00
silicons 993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
timothyteakettle 584e74590f port1 2020-07-17 02:01:33 +01:00
silicons 484da28600 Merge branch 'master' into shoelaces 2020-07-16 17:31:41 -07:00
silicons e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
DeltaFire 9e05d9f748 fixes swarmers not being able to eat any items 2020-07-16 23:26:46 +02:00
Timothy Teakettle ebd648c03d name edgecase too 2020-07-16 18:32:24 +01:00
Timothy Teakettle a8a495c0ac rewrites pickle handling 2020-07-16 18:22:58 +01:00
Artur 9e73788714 Gah 2020-07-16 17:40:05 +03:00
BlackMajor fc909cd7c6 Added material sheets and tiles. This took more work than you'd think. 2020-07-17 01:17:54 +12:00
Arturlang 92ed5d3201 Merge branch 'master' into TGUI-3.0 2020-07-16 15:59:37 +03:00
Artur af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
Letter N 7eab0263ba https://github.com/tgstation/tgstation/pull/51213 2020-07-16 20:51:25 +08:00
Letter N 819ca63456 https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing 2020-07-16 20:42:02 +08:00
Letter N abd0ac089d https://github.com/tgstation/tgstation/pull/51687 2020-07-16 20:36:08 +08:00
Letter N 8083efd1ad https://github.com/tgstation/tgstation/pull/51864 2020-07-16 20:29:56 +08:00
Letter N 9575c52b13 https://github.com/tgstation/tgstation/pull/52059 - the forgotten part 2020-07-16 20:21:39 +08:00
Letter N 2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
TheSpaghetti 1e07a277f4 Makes extradimensional oranges weirder. 2020-07-16 03:17:28 -04:00
Keate Senior 17ef5b4742 removes the still unused caches and daemons.
apparently I didn't /actually/ remove the structures fully but here's the rest of them. Oh well, RIP old clockcult buildings, maybe someone will have a use for you in the future.
2020-07-16 02:34:20 -04:00
Keate Senior 287df312e1 Reebe should probably initialize with the mode again, huh. 2020-07-16 02:31:38 -04:00
nik707 fa8a6dd3e1 Merge pull request #12788 from silicons/gasmixture_vv
"""user-friendly""" vv handling for new c++ atmos gas mixtures
2020-07-16 01:19:20 -05:00
timothyteakettle 8bfc30c8ac i can't spell 2020-07-16 02:54:31 +01:00
timothyteakettle 03bd806c73 pickle 2020-07-16 02:51:07 +01:00
silicons 7f9571f239 ok 2020-07-15 17:17:09 -07:00
silicons 4785a753ba Update SDQL_2.dm 2020-07-15 17:12:48 -07:00
silicons b279c82bb2 whew 2020-07-15 17:10:08 -07:00
silicons dba5855929 epic 2020-07-15 17:01:22 -07:00
silicons 96fb3cad8f ok 2020-07-15 17:00:17 -07:00
silicons 6fbd7914f5 stuff 2020-07-15 16:58:44 -07:00
CameronWoof a493ecdc4a suture and mesh additions 2020-07-15 16:44:24 -07:00
Timothy Teakettle a7e2668eff funniest 2020-07-15 23:50:39 +01:00
silicons f653fd5c3c kay 2020-07-15 14:58:51 -07:00
silicons 147a905b5d Merge pull request #12783 from Sneakyrat6/oocNotesExploit
Fixes seeing real name in OOC Notes
2020-07-15 14:48:55 -07:00
silicons 8f478ce66a quirky uh oh 2020-07-15 14:47:59 -07:00
Timothy Teakettle 0184739005 undo the woopsy 2020-07-15 19:53:37 +01:00
Sneakyrat6 538e7c62cd Fixes seeing real name in OOC Notes 2020-07-15 13:32:56 -05:00
silicons 6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
2020-07-15 08:50:20 -07:00
Timothy Teakettle 8ca3958bcf woops dont let monkeys die 2020-07-15 16:23:37 +01:00
BlackMajor 06a4e57de9 changing this just means they can pick up jetpacks 2020-07-16 02:11:38 +12:00