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 |
|
Ghommie
|
79c4ce502e
|
more pda skins.
|
2019-06-10 00:28:43 +02:00 |
|
Trilbyspaceclone
|
0d7b769eee
|
Merge branch 'master' into meteor
|
2019-06-09 17:01:06 -04:00 |
|
Ghommie
|
d2e216f2de
|
tested fixed tested fixed tested.
|
2019-06-09 19:55:08 +02:00 |
|
Trilbyspaceclone
|
7c59349ad3
|
Update medical.dm
|
2019-06-09 12:02:16 -04:00 |
|
Poojawa
|
3f1b7e4dd6
|
Pacifists can nom things now, but not feed to others
|
2019-06-09 02:23:53 -05:00 |
|
kevinz000
|
b534f57374
|
Update human.dm
|
2019-06-08 23:44:27 -07:00 |
|
Poojawa
|
cac80ec8c8
|
Update laborstacker.dm
|
2019-06-09 01:43:39 -05:00 |
|
kevinz000
|
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 |
|
kevinz000
|
1a07f304c9
|
Update examine.dm
|
2019-06-08 17:32:36 -07:00 |
|
kevinz000
|
5cf0a9e67f
|
Update carbon_defense.dm
|
2019-06-08 17:30:50 -07:00 |
|
kevinz000
|
5c6100dfc6
|
Update food_reagents.dm
|
2019-06-08 15:52:55 -07:00 |
|
Thalpy
|
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 |
|
Trilbyspaceclone
|
b073c29b19
|
Update all_nodes.dm
|
2019-06-08 16:17:49 -04:00 |
|
Trilbyspaceclone
|
3b941210e5
|
Update medical_designs.dm
|
2019-06-08 16:16:17 -04:00 |
|
Ghommie
|
52d217a92b
|
deathride man good.
|
2019-06-08 21:48:39 +02:00 |
|
Ghommie
|
480ee9a9da
|
Reskinnable PDAs.
|
2019-06-08 19:55:47 +02:00 |
|
kevinz000
|
2cda2380f6
|
durasteel toolboxes
|
2019-06-08 03:50:22 -07:00 |
|
kevinz000
|
3f34e3c93d
|
Update stun.dm
|
2019-06-08 03:30:25 -07:00 |
|
kevinz000
|
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 |
|
kevinz000
|
d36b8068fa
|
Merge pull request #8556 from Poojawa/ninja-speak
Gives Ninjas back their Weeb speech modification
|
2019-06-08 01:29:42 -07:00 |
|
kevinz000
|
d28754cb4d
|
Merge pull request #8560 from Ghommie/Ghommie-cit37
Ports in the fix against hitting oneself with one's own thrown items.
|
2019-06-08 01:27:43 -07:00 |
|
kevinz000
|
2f2885f1d6
|
Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
|
2019-06-08 01:26:28 -07:00 |
|
kevinz000
|
aca85123be
|
Merge pull request #8555 from Ghommie/Ghommie-cit32
Updates radials, makes RCD and RCL use em.
|
2019-06-08 01:25:37 -07:00 |
|
kevinz000
|
1488af1a52
|
Merge pull request #8554 from Ghommie/Ghommie-cit33
Adds AI core screen selection to character preferences and turns icon selection menu into a radial.
|
2019-06-08 01:24:59 -07:00 |
|
kevinz000
|
eb1c767ab7
|
Merge pull request #8553 from Poojawa/ghost-erp
Clarifies a few things about subtler and how it should be used
|
2019-06-08 01:24:36 -07:00 |
|
kevinz000
|
ae5d4de111
|
Merge pull request #8552 from Ghommie/Ghommie-cit31
Ports "Fixes goonchat cookies not saving properly."
|
2019-06-08 01:24:16 -07:00 |
|
kevinz000
|
95abaf6a6e
|
Merge pull request #8551 from Ghommie/Ghommie-cit30
Port paradise goonchat uridecode fix
|
2019-06-08 01:23:59 -07:00 |
|
kevinz000
|
4050ba98eb
|
Merge pull request #8549 from Trilbyspaceclone/patch-168
Fixes a unseen paper work exsplote
|
2019-06-08 01:23:31 -07:00 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
kevinz000
|
88990f5ae0
|
Merge pull request #8544 from Trilbyspaceclone/patch-166
Makes ice cream vats and food carts buy-able via cargo
|
2019-06-08 01:21:41 -07:00 |
|
kevinz000
|
9edac9fc6c
|
Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss
Rebalanced Ass Slapping
|
2019-06-08 01:17:04 -07:00 |
|
kevinz000
|
a866ceb8a2
|
Merge pull request #8543 from Trilbyspaceclone/patch-165
Makes SNOWCONES!
|
2019-06-08 01:15:58 -07:00 |
|
kevinz000
|
f458828659
|
Merge pull request #8503 from Trilbyspaceclone/patch-159
Changing up the drills/picks/jackhammer a bit
|
2019-06-08 01:10:34 -07:00 |
|
kevinz000
|
f201bd1508
|
Merge pull request #8494 from Trilbyspaceclone/ash_walker
Ash walker bone satchles.
|
2019-06-08 01:09:26 -07:00 |
|
kevinz000
|
487461fbda
|
Merge pull request #8500 from Trilbyspaceclone/patch-158
Buffs stun slugs
|
2019-06-08 01:09:00 -07:00 |
|
kevinz000
|
c8435a5658
|
Merge pull request #8414 from Trilbyspaceclone/MASON
New M.A.S.O.N rig
|
2019-06-08 01:08:00 -07:00 |
|
kevinz000
|
3b24e05dd6
|
Merge pull request #8483 from Ghommie/Ghommie-cit23
Ports in combat gloves plus.
|
2019-06-08 01:07:18 -07:00 |
|
kevinz000
|
61d0ac9993
|
Merge pull request #8476 from Trilbyspaceclone/patch-157
Tweaks/Buffs hierophant
|
2019-06-08 01:05:28 -07:00 |
|