kevinz000
|
e7bf1738cd
|
ok putnom
|
2020-01-23 18:00:33 -07:00 |
|
kevinz000
|
5cbe2226e1
|
Merge remote-tracking branch 'citadel/master' into hijack
|
2020-01-23 17:15:49 -07:00 |
|
Ghom
|
14a33ee7dc
|
Merge pull request #10651 from r4d6/Soft-rad-suit
Make the radiation hardsuit a voidsuit instead
|
2020-01-23 19:23:09 +01:00 |
|
Ghom
|
21867f60dd
|
Merge pull request #10598 from Putnam3145/metabolic-synth-tweak
Made metabolic synthesis nanites stop if not fed
|
2020-01-23 16:38:39 +01:00 |
|
Ghom
|
86a3a5dd4d
|
Merge pull request #10610 from Owai-Seek/bountytweaks
Some Bounty Tweaks
|
2020-01-23 15:44:00 +01:00 |
|
Ghom
|
f3b9b20e57
|
Merge pull request #10672 from BlackMajor/master
Fixes a donor sprite.
|
2020-01-23 15:30:29 +01:00 |
|
BlackMajor
|
77e7dff11b
|
Webedit PR man bad
|
2020-01-24 01:41:40 +13:00 |
|
Winter Flare
|
3d85499919
|
Requested Changes + Nerf
Nerf cannabis bounties, comment out monkey cube bounty, change to shady jims.
|
2020-01-23 07:20:22 -05:00 |
|
BlackMajor
|
5fb2e60ebf
|
Merge branch 'master' into master
|
2020-01-24 00:50:46 +13:00 |
|
kevinz000
|
83591f8883
|
Merge pull request #10620 from Hatterhat/patch-1
exo suit nerf - melee and bomb armor
|
2020-01-23 04:48:06 -07:00 |
|
kevinz000
|
aa19c2a17b
|
Merge pull request #10603 from Ghommie/Ghommie-cit510
clockwork cuirass now compatible with snakes. The original author was too lazy.
|
2020-01-23 04:47:18 -07:00 |
|
kevinz000
|
1b7265d8c1
|
Merge pull request #10605 from r4d6/Layer
Port TG Layers updates and Freezer update
|
2020-01-23 04:46:52 -07:00 |
|
BlackMajor
|
7733d3f98a
|
Update robot_modules.dm
|
2020-01-24 00:42:41 +13:00 |
|
kevinz000
|
88f625edfc
|
Merge pull request #10636 from Ghommie/Ghommie-cit512
Trilby's solar panels PR but improved.
|
2020-01-23 04:35:13 -07:00 |
|
kevinz000
|
a01d7260d8
|
Merge pull request #10641 from jakeramsay007/Calibers-101
Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.
|
2020-01-23 04:34:24 -07:00 |
|
TrilbySpaceClone
|
86ea13afeb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into patch-270
|
2020-01-22 23:00:54 -05:00 |
|
Ghom
|
bf62563507
|
Merge pull request #10410 from CameronWoof/free-the-lizard
Humans and anthromorphs can now use lizard tails.
|
2020-01-23 03:06:52 +01:00 |
|
Ghom
|
3ce27d6c36
|
Merge pull request #10638 from Hatterhat/patch-3
compact defibs have a properly set departmental flag now
|
2020-01-23 02:51:17 +01:00 |
|
Ghom
|
04811c9c22
|
Merge pull request #10450 from Citadel-Station-13/kevinz000-patch-8
(is this really a good idea) hitscan emitters
|
2020-01-23 02:44:17 +01:00 |
|
Ghom
|
fcbc5149c4
|
Merge pull request #10606 from r4d6/patch-2
Update the Passive Vents that I added
|
2020-01-23 02:40:54 +01:00 |
|
r4d6
|
c78944c5bc
|
Update
|
2020-01-22 13:47:57 -05:00 |
|
r4d6
|
869e31b27b
|
Removing useless code
|
2020-01-22 13:17:47 -05:00 |
|
r4d6
|
96c0a86b5f
|
Make the Radiation Hardsuit a Voidsuit instead
|
2020-01-22 13:17:29 -05:00 |
|
Trilbyspaceclone
|
ebb6ac1d7b
|
more words
|
2020-01-22 11:33:39 -05:00 |
|
kevinz000
|
c4475b1dda
|
variables
|
2020-01-22 05:39:16 -07:00 |
|
kevinz000
|
a28ebcc041
|
variables
|
2020-01-22 05:38:53 -07:00 |
|
kevinz000
|
ccb5d32ab2
|
varnames
|
2020-01-22 05:38:09 -07:00 |
|
kevinz000
|
ff98fe7bf5
|
update
|
2020-01-22 05:35:21 -07:00 |
|
kevinz000
|
a8628cee33
|
udpates
|
2020-01-22 05:32:57 -07:00 |
|
kevinz000
|
9ef3879e53
|
fix
|
2020-01-22 05:17:59 -07:00 |
|
kevinz000
|
5b6f95cb1e
|
shuttle hijack
|
2020-01-22 05:16:33 -07:00 |
|
Trilbyspaceclone
|
bc1500c04c
|
Update cleanbot.dm
|
2020-01-21 18:33:04 -05:00 |
|
Chayse Ramsay
|
5e5d80238b
|
Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.
Effectively it means you can load .38 rubber into a .357 revolver to make it less than lethal, or use the various different .38 ammo types.
|
2020-01-21 22:29:15 +00:00 |
|
kevinz000
|
ed5172f9ca
|
changes
|
2020-01-20 23:17:58 -07:00 |
|
kevinz000
|
8f60d01208
|
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8
|
2020-01-20 22:47:21 -07:00 |
|
Ghom
|
8e49c99ca0
|
Merge pull request #10619 from Seris02/conveyor
conveyor updates
|
2020-01-21 03:37:42 +01:00 |
|
Ghom
|
3c53619f2a
|
Merge pull request #10616 from Citadel-Station-13/kevinz000-patch-15
Renames created volume in pyrotechnics to multiplier to alleviate confusion
|
2020-01-21 03:05:22 +01:00 |
|
Ghom
|
7a3f0d140c
|
Merge pull request #10468 from Citadel-Station-13/stop-ghosting
ghosting no longer makes it so you don't count for abductors
|
2020-01-21 02:26:25 +01:00 |
|
kevinz000
|
efe3ebdb53
|
bet
|
2020-01-20 17:50:07 -07:00 |
|
Hatterhat
|
fae0d6fe3f
|
remember when i hoped i didnt forget something
|
2020-01-20 18:06:07 -06:00 |
|
Ghommie
|
ddf037da92
|
Trilby's solar panels PR but improved.
|
2020-01-21 00:28:41 +01:00 |
|
Hatterhat
|
348fa8be86
|
salt pr @kevinz000
|
2020-01-20 17:27:51 -06:00 |
|
Ghom
|
28a6e6eccf
|
Merge pull request #10621 from Hatterhat/am-i-really-gonna-do-this
.357 AP printable from illegal ballistics
|
2020-01-20 18:50:25 +01:00 |
|
Seris02
|
ab771d9505
|
I deleted an important thing
|
2020-01-20 15:48:55 +08:00 |
|
kevinz000
|
593e626233
|
Merge pull request #10346 from deathride58/limbstamlossnerf
Nerfs limb stamcrit by doubling the base limb stam regen rate and making disabled limbs double the regen rate further
|
2020-01-19 23:11:02 -07:00 |
|
Hatterhat
|
28a2cc4a3d
|
.357 AP printable from illegal ballistics
|
2020-01-19 23:55:12 -06:00 |
|
Hatterhat
|
9b9c7c3018
|
exo nerf
|
2020-01-19 20:37:31 -06:00 |
|
Seris02
|
afd848e45a
|
weh
|
2020-01-20 10:29:09 +08:00 |
|
Ghom
|
77911f9009
|
Merge pull request #10597 from Putnam3145/player-panel-can-reenter
Ghost role eligibility activation in player panel
|
2020-01-20 03:24:46 +01:00 |
|
Ghom
|
8a091c5140
|
Merge pull request #10614 from Putnam3145/suicide_option
Made suicide a config flag
|
2020-01-20 03:24:00 +01:00 |
|