Trilbyspaceclone
|
bacd0d39de
|
recomplie
|
2019-10-01 20:56:01 -04:00 |
|
Ghommie
|
81fc0c1b32
|
more foolproofing.
|
2019-10-02 00:37:02 +02:00 |
|
Ghommie
|
d2300765b2
|
adjacency checks.
|
2019-10-01 23:16:47 +02:00 |
|
Ghommie
|
cfcd325778
|
reworking the shoving people action.
|
2019-10-01 23:13:08 +02:00 |
|
Ghommie
|
340f8498a3
|
Fixes some more issues with shoving people.
|
2019-10-01 22:11:41 +02:00 |
|
Thalpy
|
bfee1c13ff
|
Bhijin's requests.
|
2019-10-01 20:58:31 +01:00 |
|
Seris02
|
07f7e6105a
|
SPOOKTOBER
because serb told me to
|
2019-10-01 22:14:05 +08:00 |
|
Seris02
|
89277e6206
|
Merge pull request #2 from Citadel-Station-13/master
updating fork from browser
|
2019-10-01 22:11:14 +08:00 |
|
Fermi
|
4b6d996416
|
Merge branch 'master' into Blind-quirk-without-anger
|
2019-10-01 08:41:12 +01:00 |
|
Thalpy
|
cf8db59649
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-01 08:20:16 +01:00 |
|
kevinz000
|
250c6ed986
|
Merge pull request #9367 from Poojawa/totally-radical
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
|
2019-10-01 00:12:32 -07:00 |
|
Fermi
|
13276d3d96
|
Tests
|
2019-10-01 07:35:59 +01:00 |
|
Fermi
|
2bbcc7f660
|
Fixes them sneaky nades
|
2019-10-01 06:48:15 +01:00 |
|
Fermi
|
553818504c
|
Hoepfully fixes unwanted traumas in the dead.
|
2019-10-01 06:21:34 +01:00 |
|
Fermi
|
89f3a01bc0
|
Merge branch 'master' into tg-Organ-port
|
2019-10-01 06:17:58 +01:00 |
|
Poojawa
|
117e5a409d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 00:05:44 -05:00 |
|
TrilbySpaceClone
|
3f893195bf
|
tested!
|
2019-09-30 11:42:07 -04:00 |
|
Weblure
|
da1209cc8b
|
Adds Xenobio Console hotkeys
Includes some minor tweaks to existing coding
|
2019-09-29 18:23:19 -07:00 |
|
Fermi
|
0762ed5265
|
oops, but also this shouldn't be able to be made.
|
2019-09-29 20:25:00 +01:00 |
|
Fermi
|
f83de63124
|
Kev's scanner malarky
|
2019-09-28 17:51:55 +01:00 |
|
Seris02
|
1bfbf790e7
|
Update xenobiology.dm
|
2019-09-28 18:42:47 +08:00 |
|
Poojawa
|
9bd6f83034
|
Applies rad_flags to a lot of common items + bluespace bags
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
|
2019-09-28 03:22:17 -05:00 |
|
kevinz000
|
6e55fec7bd
|
Merge pull request #9189 from Sishen1542/gatling
[READY] craftable laser minigun, because why not
|
2019-09-28 00:40:02 -07:00 |
|
kevinz000
|
0febc1977a
|
Merge pull request #9191 from Linzolle/fireman
Ports fireman carrying from /tg/
|
2019-09-28 00:38:08 -07:00 |
|
kevinz000
|
6fa6502b75
|
Merge branch 'master' into tgfusion
|
2019-09-28 00:35:50 -07:00 |
|
kevinz000
|
7c3036f027
|
Merge pull request #9267 from Tupinambis/EngineeringCriticalFix
Gives the Endivend Upgraded RCDs by default, instead of Autolathe ones.
|
2019-09-28 00:28:43 -07:00 |
|
kevinz000
|
8d9520ee58
|
Merge pull request #9336 from Thalpy/beakerpH_tweaks
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
|
2019-09-28 00:26:51 -07:00 |
|
kevinz000
|
426104021e
|
Merge pull request #9321 from Linzolle/bloodrites
some cult fixes + cult qol
|
2019-09-28 00:24:15 -07:00 |
|
kevinz000
|
6b33e3bd0b
|
Merge pull request #9322 from Sishen1542/cult
blood cult conversion no longer requires consent
|
2019-09-28 00:23:48 -07:00 |
|
kevinz000
|
cbe6a54531
|
Merge pull request #9326 from YakumoChen/radioactive-paperweight
Advanced energy guns glow more
|
2019-09-28 00:23:31 -07:00 |
|
kevinz000
|
cc64b8e0a4
|
Merge pull request #9320 from Ghommie/Ghommie-cit200
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
|
2019-09-28 00:22:13 -07:00 |
|
kevinz000
|
3ce5b318ca
|
Merge pull request #9317 from Ghommie/Ghommie-cit199
Ports sleepy pens and emagged borg cookies buffs (also "chloralhydratedelayed" removal), plus tirizene buff.
|
2019-09-28 00:21:47 -07:00 |
|
kevinz000
|
5562db4ed4
|
Merge pull request #8914 from Ghommie/Ghommie-cit147
Updating spraycans and crayons.
|
2019-09-28 00:20:42 -07:00 |
|
kevinz000
|
b28e65637e
|
Merge pull request #9344 from Ghommie/Ghommie-cit208
Makes abandoned crates less prone to explosions.
|
2019-09-28 00:15:27 -07:00 |
|
kevinz000
|
1b295c8501
|
Merge pull request #9359 from deathride58/fuckstoredpower
Rad collector tweaks - Reverts point production to its original behavior, clears up examine text
|
2019-09-28 00:14:47 -07:00 |
|
Fermi
|
391af0f946
|
I have no idea why the brain doesn't decay, but this seems to fix it.
|
2019-09-28 07:26:59 +01:00 |
|
Poojawa
|
f14272e445
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-27 23:30:05 -05:00 |
|
Linzolle
|
0d3a2cdd57
|
cultist check
|
2019-09-27 19:15:19 -05:00 |
|
Fermi
|
d44fbd3fb1
|
Brain fix
|
2019-09-27 23:46:44 +01:00 |
|
Ghommie
|
ce02f712ba
|
tested.
|
2019-09-27 17:59:26 +02:00 |
|
Fermi
|
b622ea4fd2
|
Fixes
|
2019-09-27 13:49:25 +01:00 |
|
Fermi
|
b16e697201
|
eye tweaks.
|
2019-09-27 13:34:27 +01:00 |
|
Fermi
|
50ef6aa257
|
Eye fix
|
2019-09-27 13:28:23 +01:00 |
|
Fermi
|
3f7c657111
|
Plate and pH (pHlate)
|
2019-09-27 12:01:03 +01:00 |
|
Fermi
|
146219edf9
|
Merge branch 'master' into beakerpH_tweaks
|
2019-09-27 11:50:31 +01:00 |
|
Fermi
|
a6a1449951
|
This was supposed to be the atomised branch aaargh!!
|
2019-09-27 11:44:15 +01:00 |
|
Fermi
|
e11197f977
|
Truth
|
2019-09-27 11:23:06 +01:00 |
|
Fermi
|
888906b4e7
|
Fixes Mk1 !
|
2019-09-27 11:12:53 +01:00 |
|
Thalpy
|
1bdb66d5de
|
Okay a few things I just saw
|
2019-09-27 07:28:02 +01:00 |
|
nik707
|
3f1f234686
|
Merge pull request #9170 from Trilbyspaceclone/more_cooking2
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
|
2019-09-26 23:54:17 -05:00 |
|