kevinz000
|
68ef76e09a
|
Merge pull request #8432 from Ghommie/Ghommie-cit15
Buffs stunprods to not have a cooldown
|
2019-06-08 01:03:01 -07:00 |
|
deathride58
|
3051994c0e
|
Merge pull request #8546 from Sishen1542/Plushies
Crew Plushies! Redtail, Annie, Paxton, Mason.
|
2019-06-08 01:10:25 -04:00 |
|
deathride58
|
8bf5777844
|
Merge pull request #8474 from Citadel-Station-13/adrenal_nerf
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
|
2019-06-08 01:07:56 -04:00 |
|
deathride58
|
aa53cc9ea9
|
Merge branch 'master' into fuckatmos
|
2019-06-07 04:38:47 -04:00 |
|
Sishen
|
b9b219d561
|
adds redtail
|
2019-06-06 16:01:40 -04:00 |
|
Sishen
|
cf3002a392
|
slimeplush
|
2019-06-06 05:14:01 -04:00 |
|
kevinz000
|
980c48180c
|
Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
|
2019-06-05 01:55:19 -07:00 |
|
kevinz000
|
102d68a243
|
Merge pull request #8518 from Ghommie/Ghommie-cit27
Fixes and updates pod's emergency suits storage.
|
2019-06-05 01:41:23 -07:00 |
|
deathride58
|
b95b14d033
|
Merge pull request #8515 from Ghommie/Ghommie-cit25
Fixes stunbatons' icons not properly updating on cell fiddling, plus cell maxcharge leniency.
|
2019-06-03 17:51:13 -04:00 |
|
Ghommie
|
6be3496d36
|
Merge branch 'Ghommie-cit15' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit15
|
2019-06-02 22:50:02 +02:00 |
|
Ghommie
|
a0898a779a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit15
|
2019-06-02 22:48:38 +02:00 |
|
Ghommie
|
472d7ef8cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27
|
2019-06-02 19:03:34 +02:00 |
|
Ghommie
|
73e279dada
|
excessive parenthesis wrapping.
|
2019-06-02 18:29:43 +02:00 |
|
Ghommie
|
d6e54bf237
|
Fixes and updates pod's emergency suits storage.
|
2019-06-02 18:28:30 +02:00 |
|
Ghommie
|
ae5d68c6f9
|
Fixes stunbatons' icons not properly updating on cell removal, and more cell charge leniency.
|
2019-06-02 13:24:03 +02:00 |
|
kevinz000
|
8b27926fee
|
Merge pull request #8463 from Trilbyspaceclone/metal_shields
Makeshift Metal shield crafting
|
2019-05-31 18:00:12 -07:00 |
|
kevinz000
|
2a5bbfdafc
|
Merge pull request #8482 from Ghommie/Ghommie-cit22
fixes pacifism eyestabbing, better this time.
|
2019-05-31 17:59:33 -07:00 |
|
kevinz000
|
16c89da587
|
Merge pull request #8485 from Trilbyspaceclone/plushies
More plushies - Reece Trilby Bhijn Box Justin
|
2019-05-31 17:55:37 -07:00 |
|
kevinz000
|
a96e414d2f
|
Merge pull request #8486 from BlackMajor/Ooga
Supermatter no longer works while inside of a turf.
|
2019-05-31 17:40:30 -07:00 |
|
Trilbyspaceclone
|
a6e85a63ba
|
Update code/game/objects/items/plushes.dm
Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com>
|
2019-05-30 11:14:31 -04:00 |
|
BlackMajor
|
0d06605662
|
Supermatter eats the closed turf it's inside.
Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.
|
2019-05-30 16:17:33 +12:00 |
|
Trilbyspaceclone
|
027ee1e596
|
Update plushes.dm
|
2019-05-29 16:40:41 -04:00 |
|
Ghommie
|
bcf1072399
|
fixes eyestabbing, better this time.
|
2019-05-29 10:08:00 +02:00 |
|
kevinz000
|
8cd0b69b61
|
adrenals
|
2019-05-28 01:00:41 -07:00 |
|
Trilbyspaceclone
|
7a17ca381b
|
tweaks
|
2019-05-27 21:58:09 -04:00 |
|
kevinz000
|
e8036a8a9b
|
Merge pull request #8439 from Ghommie/Ghommie-cit18
stunbaton status rework.
|
2019-05-27 14:08:52 -07:00 |
|
JTGSZ
|
93813613aa
|
Some changes.
|
2019-05-27 14:42:07 -04:00 |
|
Trilbyspaceclone
|
6633ff4533
|
grammar
|
2019-05-27 04:47:56 -04:00 |
|
Trilbyspaceclone
|
f2ee85371d
|
Update shields.dm
|
2019-05-27 04:40:47 -04:00 |
|
Ghommie
|
37aa491fa5
|
removes emp downtime, Kev's request.
|
2019-05-27 02:30:03 +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 |
|
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 |
|
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 |
|
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
|
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 |
|