dtfe3
745df721ba
CWC player requirement increase
...
Player requirement increase from 30 to 45
well basically most people dislike CWC in lowpop and it's generally unbalanced during lowpop so let's just not have it happen during lowpop. Easy fix!
2019-05-26 23:20:27 +02:00
Ghom
7e10b4bed9
Update code/game/objects/items/stunbaton.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-05-26 22:03:38 +02:00
Poojawa
9f80896280
eh, was going somewhere with this
...
IPC gibspawner, looking into infinite footprints
2019-05-26 05:36:33 -05:00
BurgerLua
e3aaff68b7
Added
2019-05-26 00:34:37 -07:00
Ghommie
a47a7b31ba
more leniency.
2019-05-26 06:56:02 +02:00
Ghommie
cfa53d53f1
updating old teleprods.
2019-05-26 06:49:58 +02:00
Ghommie
288f97dd13
further tweaking.
2019-05-26 06:38:04 +02:00
Ghommie
7289d8a999
tweaking.
2019-05-26 06:31:25 +02:00
Ghommie
9b2ab8fc2a
21 minutes sounds, I don't really wanna overly punish.
2019-05-26 05:21:17 +02:00
Ghommie
e61942cba9
it will approx take 18-19 minutes now.
2019-05-26 05:18:07 +02:00
Ghommie
28c435134b
stunbaton emp & status tweaks
2019-05-26 04:52:05 +02:00
Ghom
b2eea5e3f4
Sorry, web edit because I didn't commit the ?.
2019-05-26 04:11:52 +02:00
Ghommie
2fe1431db6
Applying suggestion, ?. so no theorical runtime.
2019-05-26 03:40:48 +02:00
Fermi
91f10442cf
Merge branch 'pr/12'
2019-05-26 02:05:48 +01:00
Trilbyspaceclone
070e43ca64
Update sheet_types.dm
2019-05-25 17:58:33 -04:00
Trilbyspaceclone
b6590cd9e9
Update boxes.dm
2019-05-25 17:54:57 -04:00
Trilbyspaceclone
ed974bdcde
Update sheet_types.dm
2019-05-25 17:18:40 -04:00
Trilbyspaceclone
a2f825d45b
Merge branch 'master' into patch-135
2019-05-25 16:12:37 -04:00
Trilbyspaceclone
12994f7a59
Update jetpack.dm
2019-05-25 16:11:33 -04:00
Trilbyspaceclone
915e41e5e6
Update jetpack.dm
2019-05-25 16:08:19 -04:00
deathride58
4fc31f6322
Merge branch 'master' into fuckatmos
2019-05-25 15:34:06 -04:00
kevinz000
90a3199315
Merge pull request #8417 from Trilbyspaceclone/patch-136
...
Gives space queen's men void jet packs + tweeks
2019-05-25 11:34:55 -07:00
kevinz000
d0819246bc
Merge pull request #8384 from nero1024/footstepB
...
Ports new footstep sounds from base /tg/
2019-05-25 11:30:57 -07:00
kevinz000
e8742a4937
Merge pull request #8402 from CdrCross/AdvDefibProofread
...
Defibrillator Upgrades Proofread
2019-05-25 11:17:34 -07:00
Ghommie
521c371253
actually, let's just halve it, won't be an issue I suppose.
2019-05-25 07:44:45 +02:00
Ghommie
34cad3786b
Reduces stunprod's delay.
2019-05-25 07:35:48 +02:00
BlackMajor
f94cbe94f6
Ports TG firebots
2019-05-24 23:58:39 +12:00
JTGSZ
38ad6785a0
Over-reduced the item costs a bit too much.
...
Lets do it in tiny increments until It plays somewhat unpredictably for all sides.
2019-05-23 01:42:00 -04:00
JTGSZ
080b29de79
Solves a few things.
2019-05-23 00:40:57 -04:00
Trilbyspaceclone
ed23f9834a
Update jetpack.dm
2019-05-22 22:19:32 -04:00
Trilbyspaceclone
e47598be8b
Update jetpack.dm
2019-05-22 18:39:51 -04:00
Trilbyspaceclone
4da50828f7
Update suit_storage_unit.dm
2019-05-22 18:31:36 -04:00
Fermi
f932fadfc6
Blood commit.
2019-05-22 18:46:46 +01:00
Poojawa
4324d08f32
aaaaAAAAAAAA
...
NOW WHY DO I HAVE INFINITE FOOTPRINTS AAAAAAAAAAAAA
2019-05-22 04:52:21 -05:00
Poojawa
971ddef989
reverts forensics components. If I can't figure it out, MURDER IT
2019-05-22 04:10:29 -05:00
Poojawa
f6f4c946e6
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-05-22 00:08:13 -05:00
CdrCross
82d308eb5e
Defibrillator Upgrades Proofread
...
My first ever contribution to Citadel, and first ever real GitHub Commit. This PR is a simple exercise in fixing and standardising some flavour text across Trilby's otherwise excellent defibrillator upgrades. (PR#8173)
No stats or gameplay elements have been adjusted.
2019-05-21 23:37:28 +02:00
Ghommie
2b668a8b7c
activated = FALSE
2019-05-21 23:12:23 +02:00
Ghommie
ab9bde1b15
reverts Lily.
2019-05-21 22:55:49 +02:00
Ghommie
20124c24ec
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-05-21 22:48:59 +02:00
Ghommie
5e4bbb0d02
Awaken, code.
2019-05-21 22:45:59 +02:00
Fermi
be4f188589
FermiChem? More like, FermiFixes!
2019-05-21 20:08:46 +01:00
JTGSZ
84016ed3ef
Here we go.
2019-05-21 12:30:44 -04:00
deathride58
d40d9791c4
Merge pull request #8271 from Citadel-Station-13/kevinz000-patch-41
...
the chaplain can now choose a weakened Eutactic energy sword as a holy weapon
2019-05-21 08:06:21 -04:00
kevinz000
55dca0bd41
Merge pull request #8139 from Trilbyspaceclone/patch-82
...
Makes mind shields bomb proof
2019-05-21 00:00:28 -07:00
kevinz000
b2c873edc0
Merge pull request #8371 from Useroth/desword
...
A weight tweak to d-esword and baseball bat, to make them catch up with the stamina rework.
2019-05-20 23:56:10 -07:00
kevinz000
dc548c06b5
Merge pull request #8293 from Useroth/ninja-adrenals
...
Adrenal implant, as well as ling and ninja adrenals buff (or rather, making them function like pre-rework (or even slightly better))
2019-05-20 23:40:52 -07:00
kevinz000
e941901165
Merge pull request #8393 from WhiteHusky/sleeper-blood-levels
...
Sleepers now show blood level and type for occupants.
2019-05-20 23:34:38 -07:00
kevinz000
3ae9661866
Merge pull request #8390 from CalamaBanana/station-charter-apostrophes
...
Captain's Charter no longer turns apostrophes into "'", too
2019-05-20 23:32:50 -07:00
kevinz000
733bb498ca
Merge pull request #8376 from Poojawa/oracle-cloning
...
Ports Oracle's cloning tube
2019-05-20 23:31:38 -07:00