Commit Graph

26895 Commits

Author SHA1 Message Date
Hatterhat 98935054bb lets try not 2 overload it 2020-08-22 15:19:07 -05:00
Timothy Teakettle 60c8dd283e shitcode begone 2020-08-22 20:02:36 +01:00
Letter N b20f63ea21 absolute head empty moment 2020-08-22 17:11:53 +08:00
Letter N 271c66ad40 travis moment 2020-08-22 17:03:10 +08:00
Letter N 7a7a6fbe68 asset moment. 2020-08-22 16:41:13 +08:00
Letter N 0b159b218a revert moment 2020-08-22 16:30:56 +08:00
Letter N 6ba29acd4e uses some cit procs. and how the fuck did i forget to componentualize this 2020-08-22 16:08:05 +08:00
Letter N 317480a3e7 something something skin texture revert. oh and oh fuck shit passkeys works again. 2020-08-22 15:07:02 +08:00
Hatterhat f50390ef80 wow i hate this fucking subsystem 2020-08-22 01:55:20 -05:00
Letter N afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Hatterhat 5fcf537f57 fuck 2020-08-22 00:34:40 -05:00
Letter N a38aca4da6 tgui moment. 2020-08-22 13:11:13 +08:00
timothyteakettle 3cf81dcc6c this is better 2020-08-22 01:56:56 +01:00
timothyteakettle 703a4ec262 weaker than fists 2020-08-22 01:47:27 +01:00
Hatterhat f59e627913 past tense moment 2020-08-21 18:15:06 -05:00
timothyteakettle e4b695f261 stop being invisible 2020-08-21 23:42:54 +01:00
timothyteakettle 613880b9b0 saves and moths 2020-08-21 23:32:43 +01:00
timothyteakettle 29ce240903 yes 2020-08-21 23:17:40 +01:00
timothyteakettle a75d91299a yep 2020-08-21 23:16:44 +01:00
Timothy Teakettle b953622e6f FUCK 2020-08-21 22:14:50 +01:00
kiwedespars 055d397e1e adds tape 2020-08-21 13:34:02 -07:00
Timothy Teakettle cbe9d05fb6 fuck 2020-08-21 21:08:17 +01:00
Detective Google 12e4c4c456 makes always_reskinnable work again 2020-08-21 15:03:51 -05:00
Detective Google 0fbd27fcfb reskin_obj is now a radial 2020-08-21 14:57:11 -05:00
Sonic121x bfc5be9d8b fix tea 2020-08-22 03:32:42 +08:00
DeltaFire bf799472d1 fixes the APC access check 2020-08-21 19:35:58 +02:00
Letter N f04918bdca working code? 2020-08-21 15:09:49 +08:00
zerothebigboy 5d611155f1 a 2020-08-21 02:15:30 -04:00
zerothebigboy 5741db4a13 Merge branch 'thefunnytemporalkatanas' of https://github.com/zeroisthebiggay/Citadel-Station-13 into thefunnytemporalkatanas
# Conflicts:
#	code/game/objects/items/weaponry.dm
2020-08-21 02:13:44 -04:00
zerothebigboy a9abdeb044 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into thefunnytemporalkatanas 2020-08-21 02:10:03 -04:00
zerothebigboy 421e32f3f9 a final touch up 2020-08-21 02:06:36 -04:00
zerothebigboy cca7e66457 a slight blink flavor 2020-08-21 01:54:09 -04:00
zeroisthebiggay a183fb3165 Update weaponry.dm
thats an extra space
2020-08-21 01:45:23 -04:00
zeroisthebiggay 7f036428bd Update weaponry.dm
thats an extra space
2020-08-21 01:40:19 -04:00
zerothebigboy b960f4055d a 2020-08-21 01:31:30 -04:00
silicons 120bcfc00c Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
raspyosu 95cb1faa37 remove redefinition of logistic function
oops! all redefines
2020-08-21 00:30:12 -04:00
raspyosu 2bd63023d1 fix it again
FIXITFIXITFIXITFIXITFIXITFIXITFIXIT

makes teg logistic (thanks to putnam for the function)
2020-08-21 00:19:46 -04:00
timothyteakettle 709ddb4e58 test 2020-08-21 03:48:30 +01:00
Hatterhat 463ff6393e uhh remind me to poke at this again 2020-08-20 21:48:05 -05:00
lolman360 623fe1cb69 Update recipes_clothing.dm 2020-08-21 12:00:09 +10:00
raspyosu c1468923d8 nerf the teg
it had to be done, my child.
2020-08-20 21:32:52 -04:00
lolman360 bda2c740ba Merge branch 'master' into AnPrimAssistants 2020-08-21 11:08:13 +10:00
Ghom cd10655985 fix 2 2020-08-20 23:02:13 +02:00
Timothy Teakettle 88fb9d277a fix lizard snouts (#13223) 2020-08-20 22:58:54 +02:00
Ghommie c39764afde Merge branch 'Ghommie-cit835' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit835 2020-08-20 20:28:46 +02:00
Ghommie 921a963e59 fix 1 2020-08-20 20:26:29 +02:00
Ghom 1242626faa Forgot the comment. 2020-08-20 19:01:13 +02:00
Ghommie fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Timothy Teakettle bc16a8f1b2 fix lizard snouts 2020-08-20 16:39:07 +01:00