Commit Graph

23863 Commits

Author SHA1 Message Date
CitadelStationBot
f0cd9bf796 Automatic changelog generation for PR #9320 [ci skip] 2019-09-28 02:22:15 -05: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
CitadelStationBot
a4792d4197 Automatic changelog generation for PR #9317 [ci skip] 2019-09-28 02:21:49 -05: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
CitadelStationBot
d7c9a15cab Automatic changelog generation for PR #8914 [ci skip] 2019-09-28 02:20:44 -05:00
kevinz000
5562db4ed4 Merge pull request #8914 from Ghommie/Ghommie-cit147
Updating spraycans and crayons.
2019-09-28 00:20:42 -07:00
CitadelStationBot
8747b47b65 Automatic changelog generation for PR #9344 [ci skip] 2019-09-28 02:15:29 -05:00
kevinz000
b28e65637e Merge pull request #9344 from Ghommie/Ghommie-cit208
Makes abandoned crates less prone to explosions.
2019-09-28 00:15:27 -07:00
CitadelStationBot
c2c23ed172 Automatic changelog generation for PR #9359 [ci skip] 2019-09-28 02:14:49 -05:00
kevinz000
1b295c8501 Merge pull request #9359 from deathride58/fuckstoredpower
Rad collector tweaks - Reverts point production to its original behavior, clears up examine text
2019-09-28 00:14:47 -07:00
CitadelStationBot
76d0cd7ef7 Automatic changelog generation for PR #9170 [ci skip] 2019-09-26 23:54:20 -05: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
CitadelStationBot
a4a7460575 Automatic changelog generation for PR #9335 [ci skip] 2019-09-26 21:33:27 -05:00
kevinz000
436e01ed0e Merge pull request #9335 from Raptorizer/Guardian_Parasite_Buffs
Guardian/Holoparasite Buffs
2019-09-26 19:33:25 -07:00
CitadelStationBot
fb8ad7c919 Automatic changelog generation for PR #9318 [ci skip] 2019-09-26 21:32:00 -05:00
kevinz000
06eb6e1537 Merge pull request #9318 from Thalpy/clingy-Chems
[Fix] Fixes small residues of chems sitting in holders without breaking slow reactions.
2019-09-26 19:31:58 -07:00
CitadelStationBot
d89975a211 Automatic changelog generation for PR #9341 [ci skip] 2019-09-26 21:31:38 -05:00
kevinz000
35237066b8 Merge pull request #9341 from Ghommie/Ghommie-cit206
Blood cult altar, forge and archives now use radial menus.
2019-09-26 19:31:36 -07:00
CitadelStationBot
916f986b91 Automatic changelog generation for PR #9348 [ci skip] 2019-09-26 21:31:03 -05:00
kevinz000
428a34d0f4 Merge pull request #9348 from Ghommie/Ghommie-cit209
Reduces holy water message spam for blood/clock cultists.
2019-09-26 19:31:01 -07:00
CitadelStationBot
34740e1be3 Automatic changelog generation for PR #9352 [ci skip] 2019-09-26 21:30:22 -05:00
kevinz000
a0f5fcbbef Merge pull request #9352 from JTGSZ/bugfix
Re-adds the Qualifies for Rank Proc Checks.
2019-09-26 19:30:19 -07:00
CitadelStationBot
c44b41fd7a Automatic changelog generation for PR #9356 [ci skip] 2019-09-26 19:21:46 -05:00
nik707
0c4976ae24 Merge pull request #9356 from EmeraldSundisk/master
Delta chapel rearrangements, janitorial office cleanup, and more.
2019-09-26 19:21:44 -05:00
deathride58
d0840074b5 PER MINUTE 2019-09-26 13:44:56 -04:00
deathride58
b3cd0859cd Rad collector tweaks - Makes point production use all stored power every process cycle, clears up examine text, makes the gas touching more obvious 2019-09-26 13:39:47 -04:00
EmeraldSundisk
7d64ccd273 Update DeltaStation2.dmm 2019-09-25 14:09:51 -07:00
TrilbySpaceClone
41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00
EmeraldSundisk
70475dc6e1 Merge pull request #5 from Citadel-Station-13/master
9/24
2019-09-24 09:26:47 -07:00
JTGSZ
5b3f6dca29 Species Job Check 2019-09-23 23:58:57 -04:00
CitadelStationBot
a224c46b5f Automatic changelog generation for PR #9338 [ci skip] 2019-09-23 22:34:53 -05:00
kevinz000
35359594ea Merge pull request #9338 from lolman360/FUCKYOUPOOJYOUACTULPIECEOFSHIT
Reverts an undocumented change
2019-09-23 20:34:50 -07:00
CitadelStationBot
4f084bfd84 Automatic changelog generation for PR #9342 [ci skip] 2019-09-23 22:17:56 -05:00
kevinz000
6a67e6f34f Merge pull request #9342 from Ghommie/Ghommie-cit207
Updating tgui.css because someone didn't do so when reworking consoles/ID interactions.
2019-09-23 20:17:54 -07:00
kevinz000
21304bc832 Merge pull request #9333 from Ghommie/Ghommie-cit203
Fixes clown shoes icon_state.
2019-09-23 20:17:42 -07:00
CitadelStationBot
8b2c2f11f8 Automatic changelog generation for PR #9334 [ci skip] 2019-09-23 22:17:28 -05:00
kevinz000
9270adba8a Merge pull request #9334 from Ghommie/Ghommie-cit204
Enables emojis for PDA messages.
2019-09-23 20:17:25 -07:00
CitadelStationBot
e124e54fc9 Automatic changelog generation for PR #9332 [ci skip] 2019-09-23 22:16:56 -05: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
CitadelStationBot
c59b8ff7fc Automatic changelog generation for PR #9331 [ci skip] 2019-09-23 22:16:38 -05: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
274fdf8c06 return. 2019-09-24 01:40:48 +02:00
Ghommie
5a822d95a4 M to L 2019-09-23 18:20:45 +02:00
Ghommie
1fa40dac38 Changes. 2019-09-23 17:25:08 +02:00
Ghommie
05a9b63b79 spam. 2019-09-23 17:06:15 +02:00
Ghommie
4795c60670 Reduces holy water message spam for blood/clock cultists. 2019-09-23 16:48:21 +02:00
Ghommie
4b70a9cf67 Makes abandoned crates less prone to explosions. 2019-09-23 03:09:15 +02:00
Ghommie
9dbebd3a34 Updating tgui.css because some baddie didn't do so when reworking consoles/ID interactions. 2019-09-23 01:23:22 +02:00
Ghommie
f37b676a14 runtimes. 2019-09-22 23:38:48 +02:00
Ghommie
a995e161ca more. 2019-09-22 22:36:29 +02:00