0389293d4a
comma
2019-09-24 02:40:43 +02:00
ee8f1022cc
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
2019-09-24 02:02:24 +02:00
f57bdc39a2
I still fucking hate components.
2019-09-23 02:03:37 -05:00
a2007dc20f
oops
2019-09-22 20:30:16 -05:00
947bb8cc69
port muscled veins too why not
2019-09-22 19:59:17 -05:00
64ce8460c0
a comma.
2019-09-22 14:53:02 +02:00
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
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
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
bf2f4b5df1
Enables emojis for PDA messages.
2019-09-21 22:42:06 +02:00
33c3f0834e
Prevents sofas being wielded and thus transformed into normal chairs.
2019-09-21 20:01:42 +02:00
5878fb351e
Fixing machinery's alt-click rotation.
2019-09-21 19:56:14 +02:00
97fa05f446
Merge branch 'master' into tg-Organ-port
2019-09-21 14:01:52 +01:00
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
c1e84774ac
one-hand shit
2019-09-20 17:28:44 -05:00
45adfd5bab
making it compile.
2019-09-20 23:20:44 +02:00
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
d12fd72ebf
Updates a buncha stuff.
2019-09-20 21:11:20 +01:00
9108c1ce89
Merge pull request #9203 from Trilbyspaceclone/fancy
...
Makes brass tools look better*
2019-09-20 12:09:33 -07:00
9b2f67d67d
reagent_flags is used elsewhere, renamed to chemical_flags
2019-09-20 19:43:37 +01:00
ec9bf9ed17
Ports sleepy pens and emagged borg cookies buffs, also buffing tirizene.
2019-09-20 19:04:28 +02:00
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
3f2933adbf
Ghommies' requests.
2019-09-19 23:31:36 +01:00
7ef5ab0332
TO TEST - also needs #9099 merging.
2019-09-19 17:52:45 +01:00
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
aabc2423a8
Oops.
2019-09-19 01:19:45 +01:00
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
dfa40a4b22
tg Code complete, now to bugtest and clear compile errors.
2019-09-18 23:57:21 +01:00
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
5e52c62f29
actual balance.
2019-09-17 03:41:53 +02:00
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
661c357aeb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers
2019-09-16 18:06:36 -05:00
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
0d9b284784
unneeded variable, no gameplay changes.
2019-09-16 18:12:05 +02:00
ca95d39a46
Slowing down police baton and tele baton speed.
2019-09-16 17:47:22 +02:00
6668630649
Merge branch 'master' into are-those-horns-are-are-you-just-retarded
2019-09-15 23:25:22 -05:00
c813555697
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-09-15 04:05:14 +02:00
2250f0e516
Merge remote-tracking branch 'refs/remotes/origin/job-menu-improvements' into gen-poppers
2019-09-13 13:00:45 -05:00
fa364bbad0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers
2019-09-13 13:00:29 -05:00
f0afc9c490
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-13 12:59:15 -05:00
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
9376bfb44d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
2019-09-13 12:56:57 -05:00
eab0b8934f
Merge pull request #9279 from Ghommie/Ghommie-cit192
...
Fixing undergarments color preferences resetting each round.
2019-09-13 10:43:43 -07:00
42613d1800
Merge pull request #9251 from Linzolle/chaplain-fashion-time
...
Allow all chaplain gear to equip the same things in their suit storage
2019-09-13 10:42:42 -07:00
213bd2fc6b
fixes
2019-09-12 23:35:21 -05:00
7e7527dcfe
Merge pull request #9086 from Sishen1542/DYNAMIC-ENTRY
...
Ports dynamic gamemode from /vg/ + also normalizes head/antag restrictions
2019-09-12 18:37:56 +12:00
4a4fe8c03c
Adding snowflake to limbgrower
2019-09-12 00:59:28 -05:00
65a89030eb
reverts the bleed changes till they can be better tuned
2019-09-12 00:14:26 -05:00
e0a29ec001
Fixing undergarments color resetting each round.
2019-09-12 02:48:26 +02:00
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
Ghommie