Commit Graph

19834 Commits

Author SHA1 Message Date
Ghommie 8764d781a3 Porting smartfridge improvements. 2019-06-19 04:28:36 +02:00
Ghommie 2d13a9f289 clothes burning only spam You of Your clothes 2019-06-19 03:41:48 +02:00
Ghommie 55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
Ghommie df9c4fd1f4 [s] Ports "Fixes PDA TK exploits" 2019-06-19 03:08:44 +02:00
Fermi e0cada7965 Quick fix for a runtime 2019-06-19 01:08:23 +01:00
Fermi fec1df2098 Rephrasal for understanding. 2019-06-19 00:52:45 +01:00
Fermi 095ea1243b Fits better. 2019-06-19 00:39:38 +01:00
Ghommie db3d5848c2 Ports in beekini and bee socks. 2019-06-19 01:28:47 +02:00
Fermi 724ec93166 oops 2019-06-19 00:24:02 +01:00
Fermi f5c98f5d57 Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf 2019-06-19 00:17:30 +01:00
Fermi fe6296b58a Added crafting recipies as per Bhijin's request. 2019-06-19 00:17:18 +01:00
Fermi 699b78dd80 Red pandas! 2019-06-18 23:00:54 +01:00
Ghommie f963ca050b thanks, badcoder trilby 2019-06-18 23:49:20 +02:00
Fermi 38ed75dc68 Reverts sneaky pandas 2019-06-18 22:48:34 +01:00
Ghommie 3e834004ec Ports in bee plushes. 2019-06-18 23:31:09 +02:00
Ghommie 75a6068a86 Ports "Fixes advanced proc calls not working + various code cleaning" 2019-06-18 22:51:48 +02:00
Ghommie d9d4a88a0b *Dramatic low-pitch scenic sound plays in* 2019-06-18 21:59:05 +02:00
Fermi ade3a4bced Fixes. 2019-06-18 19:06:26 +01:00
Fermi d2a5e9ddfd Makeup panda 2019-06-18 18:51:30 +01:00
kevinz000 634f11d60d Update human.dm 2019-06-18 02:34:05 -07:00
kevinz000 8061be14c8 Update chat_commands.dm 2019-06-17 22:50:12 -07:00
kevinz000 b48d0ff802 Update chat_commands.dm 2019-06-17 22:43:49 -07:00
Ghommie 138e7871cc copy pasta 2019-06-17 22:48:12 +02:00
Ghommie c0d67af8d1 Fixing vape fuck ups. 2019-06-17 22:39:17 +02:00
Ghommie 4797a306cc applying suggestions. 2019-06-17 22:04:34 +02:00
Trilbyspaceclone 4e1ac41393 Update species.dm 2019-06-17 14:41:06 -04:00
kevinz000 cbea384175 Merge remote-tracking branch 'origin/master' into sprint_stamina 2019-06-17 11:39:03 -07:00
Sishen 95a6b5d7a9 Update arcade.dm 2019-06-17 14:35:24 -04:00
Sishen 96f0f0bd24 Update arcade.dm 2019-06-17 14:31:24 -04:00
Poojawa bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602)
* Gentials layered under underclothes

* screm
2019-06-17 11:20:25 -07:00
Trilbyspaceclone d3cbbe708c Update misc.dm 2019-06-17 14:20:11 -04:00
Trilbyspaceclone 0db4125956 Update uplink_items.dm 2019-06-17 14:19:19 -04:00
Ghom 95dc8084f1 Moving some tablecrafting recipes to the appropriate categories (#8658)
* Moving some recipes to the appropriate categories

* Fixes the not-a-sandwich recipe being M.I.A.
2019-06-17 11:18:49 -07:00
Ghom 2845428c03 ports "Improve efficiency of SSmapping init" (#8651) 2019-06-17 11:18:28 -07:00
Ghom d60a360e90 Ports "Removes firebug from goonchat" (#8650)
* Ports "Removes firebug from goonchat"

* fucking acient goonchat pre-sync stuff.
2019-06-17 11:17:38 -07:00
kevinz000 4f42d40681 Merge pull request #8507 from Thalpy/Wheelchairs
Adds Hoverchairs and the paraplegic trait.
2019-06-17 11:13:43 -07:00
Trilbyspaceclone 682e6f71f0 Update robot_bodyparts.dm 2019-06-17 13:32:20 -04:00
Trilbyspaceclone 77652e6cbb Makes upgraded prostics worth getting 2019-06-17 12:57:49 -04:00
Fermi 4526832e7d I'm spending too much time trying to fix something rejected. 2019-06-17 15:16:45 +01:00
Fermi d092dd1da0 Testing hypnoquirk 2019-06-17 12:47:23 +01:00
Fermi 59469fae2e Oops. 2019-06-17 12:40:30 +01:00
Fermi 49c76986ca Whoops 2019-06-17 12:31:45 +01:00
Thalpy 41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
Fermi 0457026c0f Missed another. 2019-06-17 12:15:54 +01:00
Thalpy 1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01:00
Fermi dd7421f130 Missed one. 2019-06-17 12:05:21 +01:00
Fermi 02de745519 Merge branch 'Wheelchairs' of https://github.com/Thalpy/Citadel-Station-13 into Wheelchairs 2019-06-17 12:02:56 +01:00
Fermi 2681a8f7a9 Updates has_trait to HAS_TRAIT 2019-06-17 12:02:39 +01:00
Ghommie 9e122a520b 👀 2019-06-17 11:18:30 +02:00
Ghommie 6f03ac192b I read it wrong. 2019-06-17 10:57:59 +02:00