Commit Graph

13630 Commits

Author SHA1 Message Date
Sishen
df7f8b8313 Update large_objects.dm 2019-06-20 19:23:47 -04:00
Sishen
0d3efa0abd sell gases to get that fuckin bike 2019-06-20 19:21:12 -04:00
Fermi
88ec4e336e Small oops. 2019-06-20 03:34:49 +01:00
Thalpy
3f10ad390b Update code/modules/mob/living/simple_animal/friendly/panda.dm
Wah

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-06-20 02:15:55 +01:00
Sishen
3fee680f39 rename flag is for pen, my mistake 2019-06-19 16:09:03 -04:00
Sishen
3211a199af trenchcloak 2019-06-19 15:57:47 -04:00
Ghommie
44a9fe9521 Fixes "Penlights Cannot Give Eye Exams" 2019-06-19 13:38:59 +02:00
Ghommie
8a302552f2 Ouch really. 2019-06-19 06:22:19 +02:00
Ghommie
98367a8b00 more. 2019-06-19 04:44:59 +02:00
Ghommie
8764d781a3 Porting smartfridge improvements. 2019-06-19 04:28:36 +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
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
kevinz000
634f11d60d Update human.dm 2019-06-18 02:34:05 -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
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
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
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
Ghommie
50dd512be7 Ports system for randomized semi-persistent chem reactions. 2019-06-17 10:50:40 +02:00
Ghommie
1c93c43e20 Fixes roffle waffle, mushroom halluginogen and some invalid reagent. 2019-06-17 09:16:45 +02:00
Ghommie
8b5bab29b2 Buffs out certain stun spells. 2019-06-17 08:06:14 +02:00
BlackMajor
1060bb05b4 Space hermit ruin 2019-06-17 17:41:46 +12:00
Ghommie
519ad202df fixes. 2019-06-17 05:19:30 +02:00
Ghommie
1323ace579 Peanuts, peanut butter, and sandwiches. 2019-06-17 05:17:24 +02:00
deathride58
c6f3bd1fd1 Merge pull request #8575 from Citadel-Station-13/kevinz000-patch-41
nerfs disablers 3 --> 3.5 ds cooldown
2019-06-16 22:53:10 -04:00
deathride58
b487b0103b Merge pull request #8574 from Citadel-Station-13/durasteel_toolboxes
Adds 2 TC durasteel toolboxes {5 stamcost, 18 mob damage, 18+22+10 structural damage, does not fit in any kind of backpack}
2019-06-16 22:52:47 -04:00