Commit Graph
13364 Commits
Author SHA1 Message Date
unknown 9219401154 Doneso 2019-06-11 14:24:16 +03:00
TrilbySpaseClone 3cebb1e807 Worked?
Yay?
2019-06-10 22:59:36 -04:00
BurgerLua 1bd0ff5ef1 Merge remote-tracking branch 'upstream/master' into RCDMEMES 2019-06-10 16:40:10 -07:00
Sishen 13853ac6bf removes family gavel, readds briefcase 2019-06-10 10:16:32 -04:00
Sishen 400ad0b03b added family gavel 2019-06-10 09:55:23 -04:00
Ghommie a7bbfe46ac Fix chem dispensers starting with an extra power cell 2019-06-10 14:55:17 +02:00
BlackMajor 7523c86071 Wasn't I supposed to do this in January 2019-06-10 22:55:38 +12:00
Poojawa d8dbad6e2e Digitigrade socks 2019-06-10 04:47:07 -05:00
Sishen 9f80fbe68b Coloring gloves? Not on my watch! 2019-06-10 05:20:54 -04:00
Sishen 4eccc12205 Why are we here? Just to suffer? 2019-06-10 04:56:24 -04:00
Poojawa 17629d4feb client check I guess 2019-06-10 03:28:56 -05:00
kevinz000 49b61b54db yeah no stamina buffer I GUESS 2019-06-10 00:18:41 -07:00
kevinz000 8ba3609a4d god why fuck 2019-06-10 00:07:04 -07:00
AnalWerewolf 8337692650 Merge branch 'master' into Fritz-cute 2019-06-10 15:15:41 +10:00
TrilbyspacecloneandGitHub 0d7b769eee Merge branch 'master' into meteor 2019-06-09 17:01:06 -04:00
TrilbyspacecloneandGitHub 7c59349ad3 Update medical.dm 2019-06-09 12:02:16 -04:00
TrilbyspacecloneandGitHub e6e5e62db2 Update briefcase.dm 2019-06-09 11:50:47 -04:00
Poojawa 3f1b7e4dd6 Pacifists can nom things now, but not feed to others 2019-06-09 02:23:53 -05:00
Sishen 611aba583f Update arcade.dm 2019-06-09 03:07:22 -04:00
kevinz000andGitHub b534f57374 Update human.dm 2019-06-08 23:44:27 -07:00
PoojawaandGitHub cac80ec8c8 Update laborstacker.dm 2019-06-09 01:43:39 -05:00
kevinz000andGitHub 1cf5e24b4d Update human.dm 2019-06-08 23:23:21 -07:00
Ghommie cb255b8719 give'r or leave'r, buddy. 2019-06-09 06:54:26 +02:00
Ghommie c3fa360270 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit43 2019-06-09 04:50:10 +02:00
kevinz000 88240ca06c Merge remote-tracking branch 'origin/master' into changeling_adrenaline 2019-06-08 19:45:19 -07:00
kevinz000 ec9ae5348f Merge remote-tracking branch 'origin/master' into kevinz000-patch-48 2019-06-08 19:10:59 -07:00
kevinz000 752a5835df Merge remote-tracking branch 'origin/master' into changeling_adrenaline 2019-06-08 18:31:37 -07:00
kevinz000 3b9188d301 let's see how badly this goes 2019-06-08 18:28:04 -07:00
kevinz000 c3db9a3cd9 stuff 2019-06-08 18:22:37 -07:00
Ghommie 7706ec6329 I LOVE THE SMELL OF NAPALM IN THE MORNING! 2019-06-09 02:45:14 +02:00
kevinz000andGitHub 1a07f304c9 Update examine.dm 2019-06-08 17:32:36 -07:00
kevinz000andGitHub 5cf0a9e67f Update carbon_defense.dm 2019-06-08 17:30:50 -07:00
ThalpyandGitHub 628482e53b Merge branch 'master' into FriendlyEmpathy 2019-06-08 23:45:37 +01:00
SkullyRoberts 30b8d8db1a Made the nudity permit cover genitals and boobs 2019-06-08 18:38:28 -04:00
SkullyRoberts e83365daed Added a penis autosurgeon as rare maint loot 2019-06-08 17:12:51 -04:00
TrilbyspacecloneandGitHub 60e89a6ca4 wrong w_class 2019-06-08 16:19:16 -04:00
TrilbyspacecloneandGitHub b073c29b19 Update all_nodes.dm 2019-06-08 16:17:49 -04:00
TrilbyspacecloneandGitHub 3b941210e5 Update medical_designs.dm 2019-06-08 16:16:17 -04:00
TrilbyspacecloneandGitHub a86d6fd9cc Update firstaid.dm 2019-06-08 16:06:36 -04:00
kevinz000andGitHub 543c9c07e2 Merge pull request #8567 from Arturlang/RPD-Update
You can now use an RPD on windows and Grilles.
2019-06-08 12:05:26 -07:00
TrilbyspacecloneandGitHub b8ddbb5008 Update shields.dm 2019-06-08 11:21:40 -04:00
Ghommie 9464e8f55a Clears up Extinguisher's slippery instructions. 2019-06-08 15:24:30 +02:00
Ghommie e1c94ef8af named arguments. 2019-06-08 15:06:07 +02:00
Ghommie ec2da508b8 Gonna go with 25 since it won't be usable on lying people. 2019-06-08 15:05:26 +02:00
Sishen 40030c40bf lmao2reach 2019-06-08 07:19:11 -04:00
kevinz000andGitHub b69986e544 Merge pull request #8514 from BurgerLUA/Arcade-Loot-Improvements
Arcade Loot Improvements + Battlemachine Tweaks
2019-06-08 03:53:13 -07:00
kevinz000 2cda2380f6 durasteel toolboxes 2019-06-08 03:50:22 -07:00
kevinz000andGitHub 3f34e3c93d Update stun.dm 2019-06-08 03:30:25 -07:00
kevinz000andGitHub 50cee124c5 Merge pull request #8563 from Sishen1542/Prideful
Pride-struck Hammer in hands/on back
2019-06-08 03:00:05 -07:00
kevinz000andGitHub bd0e16461b Merge pull request #8522 from Useroth/changeling-hentai
Made the changeling tentacle disarm a bit more reliable.
2019-06-08 01:32:52 -07:00