kevinz000
|
481f038e01
|
Update item_attack.dm
|
2020-02-13 05:40:36 -07:00 |
|
kevinz000
|
5d3f39b1ae
|
Update DNA.dm
|
2020-02-13 05:39:59 -07:00 |
|
kevinz000
|
87097fb059
|
Update storage.dm
|
2020-02-13 05:30:44 -07:00 |
|
kevinz000
|
3aa3fc3614
|
Update storage.dm
|
2020-02-13 05:15:19 -07:00 |
|
Ghom
|
fdbef6a93c
|
Update bin.dm
|
2020-02-13 13:10:36 +01:00 |
|
kevinz000
|
c1f59512da
|
Merge branch 'stuff' of github.com-kevinz000:kevinz000/Citadel-Station-13 into stuff
|
2020-02-13 04:15:37 -07:00 |
|
kevinz000
|
863ce5152b
|
Merge remote-tracking branch 'citadel/master' into stuff
|
2020-02-13 04:14:44 -07:00 |
|
kevinz000
|
4345f01322
|
Merge pull request #11021 from Ghommie/Ghommie-cit571
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
|
2020-02-13 04:11:01 -07:00 |
|
kevinz000
|
4b2624b932
|
Update interaction_flags.dm
|
2020-02-13 03:09:56 -07:00 |
|
kevinz000
|
d74cfb7734
|
Update compressionkit.dm
|
2020-02-13 02:22:25 -07:00 |
|
kevinz000
|
7332fe97b8
|
Update pool_controller.dm
|
2020-02-13 02:06:32 -07:00 |
|
Trilbyspaceclone
|
7e1a35f244
|
projectile now deals 40 rather then 50
|
2020-02-13 04:00:05 -05:00 |
|
Winter Flare
|
3b5ec22076
|
Vendor Nerf
|
2020-02-13 03:54:31 -05:00 |
|
kevinz000
|
14add89a5e
|
Update heart.dm
|
2020-02-13 01:52:00 -07:00 |
|
kevinz000
|
e4f6131dcf
|
Update brain_item.dm
|
2020-02-13 01:51:16 -07:00 |
|
kevinz000
|
9331b26a21
|
Update DNA.dm
|
2020-02-13 01:42:27 -07:00 |
|
Ghom
|
a7d29ae830
|
Merge pull request #10973 from Trilbyspaceclone/put-a-pin-in-it
Station Locked firing pins
|
2020-02-13 09:42:22 +01:00 |
|
Ghom
|
5730b717c5
|
Merge pull request #10969 from Seris02/crowbarcrate
allows you to wirecutters the manifests off crates without opening them
|
2020-02-13 09:41:10 +01:00 |
|
Ghom
|
b3a530abc9
|
Merge pull request #11027 from ShadeAware/capsdrobe2
Captain's Locker De-bloat, plus the Captain's Wardrobe (NOW WITH NO MERGE CONFLICTS)!
|
2020-02-13 09:40:22 +01:00 |
|
Ghom
|
500ed0dd57
|
Merge pull request #10955 from Citadel-Station-13/kevinz000-patch-10
refactors and changes up gravity gun projectiles a bit
|
2020-02-13 09:39:26 +01:00 |
|
Ghom
|
bfdef7fcfd
|
Merge pull request #10755 from kevinz000/attack_chain
small refactor to melee_attack_chain
|
2020-02-13 09:39:07 +01:00 |
|
Ghom
|
380983bd10
|
Merge pull request #11026 from Trilbyspaceclone/patch-278
Makes ninja and wizards no longer spawn with suit sensors
|
2020-02-13 09:36:10 +01:00 |
|
Winter Flare
|
ac55d1d25d
|
Merge branch 'master' into tinytweaks-2-9-20
|
2020-02-13 03:34:44 -05:00 |
|
Ghom
|
721b647e3c
|
Merge pull request #11024 from Citadel-Station-13/kevinz000-patch-5
Fixes brig cell timers, alternatively "WHO DECIDED TO USE NUMBER OF SECONDS FROM 2000 INSTEAD OF FROM THE CURRENT DAY"
|
2020-02-13 09:28:35 +01:00 |
|
Winter Flare
|
f32affdb1c
|
Made Mugs Colorful
|
2020-02-13 03:26:35 -05:00 |
|
Trilbyspaceclone
|
aa12ec70a3
|
Update shields.dm
|
2020-02-13 03:02:26 -05:00 |
|
kevinz000
|
a8a071851a
|
s
|
2020-02-13 00:32:26 -07:00 |
|
kevinz000
|
40111faab1
|
Update geiger_counter.dm
|
2020-02-13 00:12:25 -07:00 |
|
kevinz000
|
f1e0c62141
|
Update gravity.dm
|
2020-02-12 23:59:03 -07:00 |
|
kevinz000
|
c790478a3d
|
Merge pull request #11012 from keronshb/RatvarDrink
Introduces the Ratvarian mixed drink, the CogChamp!
|
2020-02-12 23:58:14 -07:00 |
|
kevinz000
|
5b01691834
|
Merge pull request #11005 from Arturlang/Hypospray_fix
Moves the hypospray mode change to CTRL click
|
2020-02-12 23:57:50 -07:00 |
|
kevinz000
|
4e419eed03
|
Merge pull request #10987 from Ghommie/Ghommie-cit567
Something about missing privates sprites and bad code.
|
2020-02-12 23:56:53 -07:00 |
|
Detective Google
|
c34617d42a
|
Merge branch 'the-p-o-o-l' of https://github.com/Detective-Google/Citadel-Station-13 into the-p-o-o-l
|
2020-02-13 00:12:13 -06:00 |
|
Detective Google
|
b6cbb3f505
|
woo yeah yeah woo
|
2020-02-13 00:12:11 -06:00 |
|
necromanceranne
|
165f46b836
|
goodbye blood bullets
|
2020-02-13 17:05:36 +11:00 |
|
Detective-Google
|
a8aa9ac24b
|
Update code/modules/pool/pool_drain.dm as per ghom suggestion 2
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-12 23:43:32 -06:00 |
|
Detective-Google
|
25c677942a
|
Update code/modules/pool/pool_main.dm as per ghom suggestion
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-12 23:43:10 -06:00 |
|
Seris02
|
4ac7fff7e3
|
ye
|
2020-02-13 13:37:47 +08:00 |
|
kevinz000
|
4f9652f2d2
|
Merge pull request #11029 from Putnam3145/fix-that-dumb
Made the fallback if config is incorrect for map voting plurality (default)
|
2020-02-12 21:01:07 -07:00 |
|
kevinz000
|
73e782a4de
|
Update teleportation.dm
|
2020-02-12 20:56:09 -07:00 |
|
keronshb
|
5d32775170
|
Changes the desc a little
Changes it to "When the cult ascends, so does the spell, it burns and throws back the victim" Thanks Justin!
|
2020-02-12 21:31:48 -05:00 |
|
keronshb
|
7949c4fa01
|
Changes cult stunhand when halos are out
Turns the stunhand into a burn + knockback hand. So it remains more defensive than offensive.
|
2020-02-12 21:24:12 -05:00 |
|
kevinz000
|
aad78ffb78
|
Update teleportation.dm
|
2020-02-12 17:53:42 -07:00 |
|
ShadeAware
|
195760e572
|
h
|
2020-02-12 16:37:00 -05:00 |
|
ShadeAware
|
0f603f2aff
|
Fixes icon state for the refill
Thank you for the catch, Ghommie.
|
2020-02-12 16:34:16 -05:00 |
|
Trilbyspaceclone
|
34d8381b67
|
Update blood_drunk_miner.dm
|
2020-02-12 15:21:17 -05:00 |
|
Trilbyspaceclone
|
0bd1357e5f
|
flour
|
2020-02-12 15:03:15 -05:00 |
|
Trilbyspaceclone
|
1ce9232958
|
Update cereals.dm
|
2020-02-12 15:00:08 -05:00 |
|
Trilbyspaceclone
|
ba8c7b191c
|
Update stickman.dm
|
2020-02-12 14:52:24 -05:00 |
|
Trilbyspaceclone
|
7cd3a51c4e
|
Update pistol.dm
|
2020-02-12 14:48:53 -05:00 |
|