Putnam
|
e1cf63e0ac
|
Greentext tweaked
|
2020-01-18 21:32:42 -08:00 |
|
Putnam
|
d287835d14
|
Made quirk blacklisting antag-sided
|
2020-01-18 21:29:27 -08:00 |
|
Ghom
|
c1e9618757
|
Merge pull request #10565 from Citadel-Station-13/revert-10379-tg-47443-shotgunpbs
Revert "shotgun pointblanking people actually throws them"
|
2020-01-16 23:18:37 +01:00 |
|
CitadelStationBot
|
1860d553e4
|
Automatic changelog generation for PR #10347 [ci skip]
|
2020-01-16 15:51:40 -06:00 |
|
kevinz000
|
d110d7bae9
|
Merge pull request #10347 from deathride58/stambufferbuff
[experimental] Buffs the stamina buffer by making it recharge for free.
|
2020-01-16 14:51:38 -07:00 |
|
CitadelStationBot
|
1108de8c37
|
Automatic changelog generation for PR #10456 [ci skip]
|
2020-01-16 06:30:34 -06:00 |
|
Ghom
|
ca13be3c92
|
Merge pull request #10456 from Putnam3145/arousal-bad
Removes arousal damage and replaces it with simpler systems
|
2020-01-16 13:30:31 +01:00 |
|
Putnam
|
fa0080d8d6
|
made climax with partner require EXPLICIT consent
|
2020-01-15 20:55:39 -08:00 |
|
Putnam
|
253a3a44ba
|
moved "aphro" magic string to a define
|
2020-01-15 20:15:40 -08:00 |
|
Putnam
|
a1922a459e
|
Moved Arousal tab stuff to IC tab
|
2020-01-15 20:14:23 -08:00 |
|
Putnam
|
de4e65c467
|
Savefile conversion for inesct
|
2020-01-15 20:13:09 -08:00 |
|
CitadelStationBot
|
04f4cf5c36
|
Automatic changelog generation for PR #10417 [ci skip]
|
2020-01-15 20:21:51 -06:00 |
|
Ghom
|
7d9f4f9fe5
|
Merge pull request #10417 from kevinz000/nightshift_1
Nightshift improvements: public area settings/levels, nightshift auth requirement change, config changes, etc etc
|
2020-01-16 03:21:49 +01:00 |
|
Ghom
|
70c1b0635a
|
early returns.
|
2020-01-16 03:14:39 +01:00 |
|
kevinz000
|
554f23e790
|
aight bet
|
2020-01-15 18:04:05 -07:00 |
|
kevinz000
|
872628d9aa
|
Apply suggestions from code review
thank you gamer
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-01-15 18:02:23 -07:00 |
|
Putnam
|
d29603ad77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-15 15:57:32 -08:00 |
|
CitadelStationBot
|
b21b3fee3c
|
Automatic changelog generation for PR #10567 [ci skip]
|
2020-01-15 14:42:30 -06:00 |
|
Lin
|
7bad8d00ad
|
Merge pull request #10567 from Ghommie/Ghommie-cot506
[s] more efficient supply reagents export.
|
2020-01-15 20:42:27 +00:00 |
|
Ghommie
|
4b090f938c
|
ok
|
2020-01-15 20:51:36 +01:00 |
|
CitadelStationBot
|
0b66a01d4a
|
Automatic changelog generation for PR #10563 [ci skip]
|
2020-01-15 08:51:18 -06:00 |
|
Ghom
|
7b34daae48
|
Merge pull request #10563 from Trilbyspaceclone/patch-268
Makes fragile suit less likely to brake from toys
|
2020-01-15 15:51:15 +01:00 |
|
Ghom
|
31c3b0f7bb
|
Merge pull request #10415 from kevinz000/tg_update_1
Small controller/backend updates from /tg/
|
2020-01-15 15:23:09 +01:00 |
|
CitadelStationBot
|
327444a1bb
|
Automatic changelog generation for PR #10557 [ci skip]
|
2020-01-15 07:54:14 -06:00 |
|
Ghom
|
5eb26682e2
|
Merge pull request #10557 from timothyteakettle/timothyteakettle-gene-modder-1
remove trait genes without disks
|
2020-01-15 14:54:11 +01:00 |
|
CitadelStationBot
|
a31150ab6c
|
Automatic changelog generation for PR #10535 [ci skip]
|
2020-01-15 07:53:29 -06:00 |
|
Ghom
|
b896a233d4
|
Merge pull request #10535 from Hatterhat/greytide-standard-uniform
staff assistant jumpsuit gang
|
2020-01-15 14:53:26 +01:00 |
|
kevinz000
|
b0c2e4cbdd
|
Revert "shotgun pointblanking people actually throws them"
|
2020-01-15 01:13:26 -07:00 |
|
Hatterhat
|
7b322ff467
|
Merge branch 'master' into greytide-standard-uniform
|
2020-01-14 19:39:16 -06:00 |
|
Hatterhat
|
3622dd118b
|
forgive me, grey jumpsuit entry
|
2020-01-14 19:38:11 -06:00 |
|
Trilbyspaceclone
|
5351bc9f8a
|
Update miscellaneous.dm
|
2020-01-14 19:15:35 -05:00 |
|
Ghom
|
8a06f2f45c
|
Merge pull request #10499 from Hatterhat/tg-40046
more /tg/station ports - tools! logging! some other fun stuff!
|
2020-01-15 01:05:36 +01:00 |
|
CitadelStationBot
|
a5aebcd6ff
|
Automatic changelog generation for PR #10530 [ci skip]
|
2020-01-14 17:47:41 -06:00 |
|
Ghom
|
5dee355381
|
Merge pull request #10530 from kappa-sama/modularer
deletes modular items but this time i don't get cucked
|
2020-01-15 00:47:38 +01:00 |
|
Lin
|
3510bf5150
|
Merge pull request #10560 from Ghommie/Ghommie-cit505
[s] makes master compile.
|
2020-01-14 22:01:35 +00:00 |
|
Ghommie
|
26d6e7f05c
|
Work.
|
2020-01-14 22:04:38 +01:00 |
|
Ghommie
|
3984943b0d
|
[s] makes master compile.
|
2020-01-14 20:02:26 +01:00 |
|
CitadelStationBot
|
1e14c0e09a
|
Automatic changelog generation for PR #10531 [ci skip]
|
2020-01-14 11:26:37 -06:00 |
|
Ghom
|
2cc87c3127
|
Merge pull request #10531 from Trilbyspaceclone/Seed-to-points
Hydroponics can now make sci points
|
2020-01-14 18:26:34 +01:00 |
|
CitadelStationBot
|
61885d0cd6
|
Automatic changelog generation for PR #10454 [ci skip]
|
2020-01-14 11:24:52 -06:00 |
|
Ghom
|
03ebab6ec5
|
Merge pull request #10454 from Commandersand/clothsfix
fixes clothing directional sprites(i swear not all of them are my fault)
|
2020-01-14 18:24:50 +01:00 |
|
TrilbySpaceClone
|
66c608512b
|
Merge branch 'Seed-to-points' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into Seed-to-points
|
2020-01-14 10:45:00 -05:00 |
|
TrilbySpaceClone
|
ccfaa294bc
|
Update research.dm
|
2020-01-14 10:40:47 -05:00 |
|
Ghom
|
11cb7357c5
|
Stop web-editing like that, little one.
|
2020-01-14 16:22:41 +01:00 |
|
kappa-sama
|
bf3f8536a2
|
hi
|
2020-01-14 09:05:05 -05:00 |
|
kappa-sama
|
dcfa8df8f1
|
bye
|
2020-01-14 09:04:50 -05:00 |
|
kappa-sama
|
17604a672d
|
epic
|
2020-01-14 09:04:35 -05:00 |
|
Trilbyspaceclone
|
bc1e24cb7b
|
Update tips.txt
|
2020-01-14 08:40:58 -05:00 |
|
Trilbyspaceclone
|
c320143d53
|
Update tips.txt
|
2020-01-14 08:39:24 -05:00 |
|
CitadelStationBot
|
69d986df8a
|
Automatic changelog generation for PR #10538 [ci skip]
|
2020-01-14 06:52:13 -06:00 |
|