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 |
|
Ghommie
|
50dd512be7
|
Ports system for randomized semi-persistent chem reactions.
|
2019-06-17 10:50:40 +02:00 |
|
Ghommie
|
d5279c8373
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-06-17 09:51:22 +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 |
|
kevinz000
|
9c50b9cb11
|
typo
|
2019-06-16 19:58:07 -07:00 |
|
kevinz000
|
3527664c40
|
Merge branch 'master' into sprint_stamina
|
2019-06-16 19:55:56 -07: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 |
|
deathride58
|
7b329ae824
|
Merge pull request #8593 from Citadel-Station-13/changeling_adrenaline
Fixes adrenaline (it didn't actually work). Replaces traitor/ling adrenal omnizine with regenjelly (3x faster, but lasts shorter too), reworks changeling adrenals to scale burst stamina heal rather than flat 100
|
2019-06-16 22:51:03 -04:00 |
|
deathride58
|
d0bc89353c
|
Merge pull request #8597 from Citadel-Station-13/kevinz000-patch-48
pacifists can now let people piggyback (grab_passive). admins now can proccall buckle_mob on humans in a way that bypasses piggyback code block
|
2019-06-16 22:50:15 -04:00 |
|
kevinz000
|
28ca8dee46
|
Merge pull request #8648 from Trilbyspaceclone/patch-178
Buffs uplink kits
|
2019-06-16 19:47:09 -07:00 |
|
kevinz000
|
78c969a9cb
|
Merge pull request #8584 from Trilbyspaceclone/patch-172
Organ Storage box
|
2019-06-16 19:43:10 -07:00 |
|
kevinz000
|
302b235911
|
Merge pull request #8505 from BurgerLUA/RCDMEMES
Clockwork Cult walls can no longer be deconstructed by RCDs when heated.
|
2019-06-16 19:42:15 -07:00 |
|
kevinz000
|
27d7dc430f
|
Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors
Adds Clockwork Reflectors
|
2019-06-16 19:41:57 -07:00 |
|
kevinz000
|
27333276de
|
Merge pull request #8570 from Trilbyspaceclone/patch-170
Ports origami skills for paper wiz loot
|
2019-06-16 19:40:01 -07:00 |
|
kevinz000
|
1739ee1685
|
Merge pull request #8578 from Ghommie/Ghommie-cit41
Clears up Extinguisher's slippery instructions.
|
2019-06-16 19:38:23 -07:00 |
|
kevinz000
|
b6aef75eed
|
Merge pull request #8652 from Ghommie/Ghommie-cit53
Ports "areas_in_z after start population fix"
|
2019-06-16 19:35:55 -07:00 |
|