 Poojawa
|
ee5155bdbb
|
fixes oddities
|
2019-10-06 04:27:46 -05:00 |
|
|
Poojawa
|
b589565398
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-03 15:05:26 -05: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
|
af9336edde
|
Merge pull request #9366 from Raptorizer/MelonSeedBuff
Equalized the power of the melon seed.
|
2019-10-02 00:01:05 -07:00 |
|
|
Poojawa
|
0482973e8f
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 22:38:12 -05: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 |
|
|
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 |
|
|
Poojawa
|
117e5a409d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 00:05:44 -05: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
|
0febc1977a
|
Merge pull request #9191 from Linzolle/fireman
Ports fireman carrying from /tg/
|
2019-09-28 00:38:08 -07:00 |
|
|
kevinz000
|
d7d4e3cbe2
|
Merge pull request #9349 from Ghommie/Ghommie-cit210
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
|
2019-09-28 00:22:38 -07:00 |
|
|
kevinz000
|
cc64b8e0a4
|
Merge pull request #9320 from Ghommie/Ghommie-cit200
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
|
2019-09-28 00:22:13 -07:00 |
|
|
kevinz000
|
3ce5b318ca
|
Merge pull request #9317 from Ghommie/Ghommie-cit199
Ports sleepy pens and emagged borg cookies buffs (also "chloralhydratedelayed" removal), plus tirizene buff.
|
2019-09-28 00:21:47 -07:00 |
|
|
kevinz000
|
5562db4ed4
|
Merge pull request #8914 from Ghommie/Ghommie-cit147
Updating spraycans and crayons.
|
2019-09-28 00:20:42 -07:00 |
|
|
Poojawa
|
ad9af65e73
|
lazily hijack the med hud update
|
2019-09-28 02:10:30 -05:00 |
|
|
Raptorizer
|
fe35a0d776
|
Projectiles increased to a proper number
|
2019-09-28 01:16:30 -05:00 |
|
|
Raptorizer
|
5607dff199
|
Update weapons.dm
Equalized the power of the melon seed.
|
2019-09-28 00:54:31 -05:00 |
|
|
Poojawa
|
f14272e445
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-27 23:30:05 -05:00 |
|
|
Ghommie
|
225b196b55
|
sure, let's fix the typo.
|
2019-09-27 22:14:51 +02:00 |
|
|
Ghommie
|
f820a95238
|
Fixing an issue with DNA scanners maintenance hatches. Also porting some sleepers code updates.
|
2019-09-27 22:01:23 +02:00 |
|
|
nik707
|
3f1f234686
|
Merge pull request #9170 from Trilbyspaceclone/more_cooking2
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
|
2019-09-26 23:54:17 -05:00 |
|
|
TrilbySpaceClone
|
41fbb759b2
|
Merge branch 'master' into more_cooking2
|
2019-09-25 14:56:11 -04:00 |
|
|
kevinz000
|
9270adba8a
|
Merge pull request #9334 from Ghommie/Ghommie-cit204
Enables emojis for PDA messages.
|
2019-09-23 20:17:25 -07:00 |
|
|
kevinz000
|
039b2a03a0
|
Merge pull request #9332 from Ghommie/Ghommie-cit202
Prevents sofas being wielded and thus transformed into normal chairs.
|
2019-09-23 20:16:53 -07:00 |
|
|
kevinz000
|
a7e7fab301
|
Merge pull request #9331 from Ghommie/Ghommie-cit201
Fixing machinery's alt-click rotation.
|
2019-09-23 20:16:35 -07:00 |
|
|
Ghommie
|
0389293d4a
|
comma
|
2019-09-24 02:40:43 +02:00 |
|
|
Ghommie
|
ee8f1022cc
|
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
|
2019-09-24 02:02:24 +02:00 |
|
|
Poojawa
|
f57bdc39a2
|
I still fucking hate components.
|
2019-09-23 02:03:37 -05:00 |
|
|
Ghommie
|
64ce8460c0
|
a comma.
|
2019-09-22 14:53:02 +02:00 |
|
|
Ghommie
|
ff451c8cf4
|
I don't want to send emoji assets to every machine interfacing with PDA messages.
Just the chat tab.
|
2019-09-22 14:50:37 +02:00 |
|
|
Poojawa
|
5876a235c2
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-22 00:22:18 -05:00 |
|
|
kevinz000
|
e44f52d89a
|
Merge pull request #9122 from Sishen1542/oops-i-did-it-again
nerf gygax melee damage, removes mech KO punches and replaces with extra knockback (and also neuters actuator overload)
|
2019-09-21 19:07:40 -07:00 |
|
|
Ghommie
|
bf2f4b5df1
|
Enables emojis for PDA messages.
|
2019-09-21 22:42:06 +02:00 |
|
|
Ghommie
|
33c3f0834e
|
Prevents sofas being wielded and thus transformed into normal chairs.
|
2019-09-21 20:01:42 +02:00 |
|
|
Ghommie
|
5878fb351e
|
Fixing machinery's alt-click rotation.
|
2019-09-21 19:56:14 +02:00 |
|
|
kevinz000
|
5608d37fd5
|
Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Synda Major Leage Player
|
2019-09-21 01:56:41 -07:00 |
|
|
Ghommie
|
45adfd5bab
|
making it compile.
|
2019-09-20 23:20:44 +02:00 |
|
|
Ghommie
|
1f2c19c1da
|
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
|
2019-09-20 22:57:06 +02:00 |
|
|
kevinz000
|
9108c1ce89
|
Merge pull request #9203 from Trilbyspaceclone/fancy
Makes brass tools look better*
|
2019-09-20 12:09:33 -07:00 |
|
|
Ghommie
|
ec9bf9ed17
|
Ports sleepy pens and emagged borg cookies buffs, also buffing tirizene.
|
2019-09-20 19:04:28 +02:00 |
|
|
Ghommie
|
277f031143
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147
|
2019-09-20 02:27:39 +02:00 |
|
|
kevinz000
|
a6f4548349
|
Merge pull request #9295 from Ghommie/Ghommie-cit196
Raising police baton and tele baton cooldown from 0.8 to 1.4 seconds.
|
2019-09-17 22:03:29 -07:00 |
|
|
Ghommie
|
5e52c62f29
|
actual balance.
|
2019-09-17 03:41:53 +02:00 |
|