 kevinz000
|
6dff5246d4
|
Update supermatter.dm
|
2019-10-02 00:12:46 -07:00 |
|
|
kevinz000
|
08ed166c08
|
Merge pull request #9365 from Ghommie/Ghommie-cit211
Fixing an issue with DNA scanners maintenance hatches with sleeper code updates.
|
2019-10-02 00:06:13 -07:00 |
|
|
kevinz000
|
1aac0942e9
|
Merge pull request #9373 from Trilbyspaceclone/beepalm
Beebalm and Honeybalm plants
|
2019-10-02 00:02:05 -07:00 |
|
|
kevinz000
|
af9336edde
|
Merge pull request #9366 from Raptorizer/MelonSeedBuff
Equalized the power of the melon seed.
|
2019-10-02 00:01:05 -07:00 |
|
|
kevinz000
|
a177e5a457
|
Merge pull request #9364 from Ghommie/Ghommie-cit206
Fixing the blood cult radial menu unholy flask option's icon.
|
2019-10-01 23:59:49 -07:00 |
|
|
Sishen
|
fbaa8d355f
|
Update dynamic.dm
|
2019-10-02 02:39:58 -04:00 |
|
|
Sishen
|
f3d373a6b8
|
loose goose
honk honk
|
2019-10-02 02:27:30 -04:00 |
|
|
Thalpy
|
72ccc5fe69
|
Loopzoop
|
2019-10-02 06:52:01 +01:00 |
|
|
Ghommie
|
02df68a1cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-02 07:26:09 +02:00 |
|
|
Sishen
|
0abcbe0fb5
|
Update suit_storage_unit.dm
|
2019-10-01 23:49:46 -04:00 |
|
|
Poojawa
|
0482973e8f
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 22:38:12 -05:00 |
|
|
Chayse Ramsay
|
5c827ed8ed
|
Fixes the Trek uniform/suit sprites
Not having mutant additions was causing the update_icons code to null out the alternate_worn_icon variable
|
2019-10-02 04:08:25 +01:00 |
|
|
Sishen
|
c9fb4cecbc
|
Update neovgre.dm
|
2019-10-01 22:30:20 -04:00 |
|
|
Sishen
|
ad7ea00627
|
Update neovgre.dm
|
2019-10-01 22:29:03 -04:00 |
|
|
Chayse Ramsay
|
bf6575c67d
|
Borgs are now capable of unbuckling people from chairs, beds, and themselves.
|
2019-10-02 02:38:39 +01:00 |
|
|
Trilbyspaceclone
|
bacd0d39de
|
recomplie
|
2019-10-01 20:56:01 -04:00 |
|
|
Ghommie
|
d245a9d28d
|
addendum
|
2019-10-02 00:42:19 +02:00 |
|
|
Ghommie
|
2a84162c59
|
incorrect number of macro arguments
|
2019-10-02 00:38:58 +02:00 |
|
|
Ghommie
|
81fc0c1b32
|
more foolproofing.
|
2019-10-02 00:37:02 +02:00 |
|
|
Ghommie
|
e635a05d16
|
errors.
|
2019-10-01 23:43:38 +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 |
|
|
kappa-sama
|
c42d5b31a1
|
ok justin
|
2019-09-30 20:13:31 -04: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 |
|
|
Weblure
|
ef6db36e4c
|
Adds Xenobio Hotkeys
|
2019-09-29 18:21:41 -07:00 |
|
|
Fermi
|
2f0e5d8091
|
Hotfix
|
2019-09-29 21:27:42 +01:00 |
|
|
Fermi
|
0762ed5265
|
oops, but also this shouldn't be able to be made.
|
2019-09-29 20:25:00 +01:00 |
|
|
kevinz000
|
5c8471808c
|
Update plastic.dm
|
2019-09-28 20:44:29 -07:00 |
|
|
Fermi
|
f83de63124
|
Kev's scanner malarky
|
2019-09-28 17:51:55 +01:00 |
|
|
Seris02
|
82e10faccf
|
Update cloning.dm
|
2019-09-28 20:27:33 +08: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 |
|
|
Poojawa
|
30e6445c0a
|
Suit Storage now purges radation contamination
|
2019-09-28 03:18:31 -05:00 |
|
|
Poojawa
|
041a4b4ed1
|
Corrects scanner measurment information
|
2019-09-28 03:18:00 -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 |
|