Commit Graph

19572 Commits

Author SHA1 Message Date
Ghom
e76fc296a4 Merge pull request #11081 from Detective-Google/prefbreakies-ooh-woo
Makes the valentines chocolates no longer rule 9 bait
2020-02-14 07:46:41 +01:00
Ghom
ef7347fc37 Merge pull request #11079 from Arturlang/patch-9
Makes valentine related antag datums convertable by bloodsuckers
2020-02-14 07:36:11 +01:00
kevinz000
94c6fae838 Update vday.dm 2020-02-13 21:27:44 -07:00
YakumoChen
2924be6a80 now with visible rings on hand(s) 2020-02-14 03:52:10 +00:00
kevinz000
b8d18758d1 Update vday.dm 2020-02-13 20:33:18 -07:00
YakumoChen
5c246fd389 diamond ring changes
More code I stole from RP
2020-02-14 03:00:31 +00:00
Detective Google
6c4c4b3f81 removes the crocin from the valentines candy 2020-02-13 19:59:38 -06:00
Arturlang
cf980b52ac Fuck valentines 2020-02-14 00:01:07 +02:00
Linzolle
790b7bf9cc sanity check 2020-02-13 15:20:01 -06:00
Linzolle
083a6e4c19 runtime? 2020-02-13 13:29:07 -06:00
Linzolle
9a87087378 message unnecessary 2020-02-13 13:26:19 -06:00
Linzolle
f890317810 maybe this will work 2020-02-13 13:02:51 -06:00
Linzolle
d22631700c update the fucking craft component because artur forgot to 2020-02-13 12:59:56 -06:00
Artur
7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Ghom
071c3a143f Update cards_ids.dm 2020-02-13 18:13:14 +01:00
Ghom
bcc7949034 Update names.dm 2020-02-13 18:02:42 +01:00
Ghom
1628934b9f Update cards_ids.dm 2020-02-13 18:00:12 +01:00
Ghom
8b44b02f2d Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
TGUI Next Uplinks
2020-02-13 16:50:10 +01:00
Ghom
28a6384427 Merge pull request #10913 from Feasel/patch-3
[Balance Pass - Dissection Early Game Buff]
2020-02-13 16:49:01 +01:00
Ghom
91824571ff Merge pull request #11035 from Citadel-Station-13/kevinz000-patch-11
fixes ctf claymores not spawning and buffs them to be armor pierce + less stamina
2020-02-13 16:42:10 +01:00
Ghom
121b37410a Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20
Sprites, Tweaks, and Snacks, QoL
2020-02-13 16:40:12 +01:00
Ghom
a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler
ports auto profiler subsystem from tg
2020-02-13 15:06:27 +01:00
Ghom
7198637463 Merge pull request #11038 from Citadel-Station-13/kevinz000-patch-7
STOP_PROCESSING now also removes from currentrun
2020-02-13 15:05:51 +01:00
Ghommie
23f7879057 taste spam 2020-02-13 14:57:08 +01:00
Artur
be30ca1642 Tweaks the blood type and volume, plus hopefully fixes the lag exploit. 2020-02-13 15:48:37 +02:00
Ghommie
747b84d255 Thank you fermis very cool 2020-02-13 14:47:53 +01:00
Ghommie
d8415aa634 Fixing tongue organ damage spam. 2020-02-13 14:44:08 +01:00
Artur
8c37cfef24 Should work now 2020-02-13 15:26:18 +02:00
Ghommie
c5b4cf0e6b Ok. 2020-02-13 14:06:05 +01:00
Ghommie
315b0a9645 Fixes halved flavor text max length and removing some crappy code. 2020-02-13 14:05:40 +01:00
kevinz000
5d3f39b1ae Update DNA.dm 2020-02-13 05:39:59 -07:00
kevinz000
87097fb059 Update storage.dm 2020-02-13 05:30:44 -07:00
kevinz000
3aa3fc3614 Update storage.dm 2020-02-13 05:15:19 -07:00
Ghom
fdbef6a93c Update bin.dm 2020-02-13 13:10:36 +01:00
kevinz000
4345f01322 Merge pull request #11021 from Ghommie/Ghommie-cit571
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
2020-02-13 04:11:01 -07:00
kevinz000
d74cfb7734 Update compressionkit.dm 2020-02-13 02:22:25 -07:00
Trilbyspaceclone
7e1a35f244 projectile now deals 40 rather then 50 2020-02-13 04:00:05 -05:00
Winter Flare
3b5ec22076 Vendor Nerf 2020-02-13 03:54:31 -05:00
kevinz000
14add89a5e Update heart.dm 2020-02-13 01:52:00 -07:00
kevinz000
e4f6131dcf Update brain_item.dm 2020-02-13 01:51:16 -07:00
kevinz000
9331b26a21 Update DNA.dm 2020-02-13 01:42:27 -07:00
Ghom
a7d29ae830 Merge pull request #10973 from Trilbyspaceclone/put-a-pin-in-it
Station Locked firing pins
2020-02-13 09:42:22 +01:00
Ghom
5730b717c5 Merge pull request #10969 from Seris02/crowbarcrate
allows you to wirecutters the manifests off crates without opening them
2020-02-13 09:41:10 +01:00
Ghom
b3a530abc9 Merge pull request #11027 from ShadeAware/capsdrobe2
Captain's Locker De-bloat, plus the Captain's Wardrobe (NOW WITH NO MERGE CONFLICTS)!
2020-02-13 09:40:22 +01:00
Ghom
500ed0dd57 Merge pull request #10955 from Citadel-Station-13/kevinz000-patch-10
refactors and changes up gravity gun projectiles a bit
2020-02-13 09:39:26 +01:00
Ghom
bfdef7fcfd Merge pull request #10755 from kevinz000/attack_chain
small refactor to melee_attack_chain
2020-02-13 09:39:07 +01:00
Ghom
380983bd10 Merge pull request #11026 from Trilbyspaceclone/patch-278
Makes ninja and wizards no longer spawn with suit sensors
2020-02-13 09:36:10 +01:00
Winter Flare
ac55d1d25d Merge branch 'master' into tinytweaks-2-9-20 2020-02-13 03:34:44 -05:00
Ghom
721b647e3c Merge pull request #11024 from Citadel-Station-13/kevinz000-patch-5
Fixes brig cell timers, alternatively "WHO DECIDED TO USE NUMBER OF SECONDS FROM 2000 INSTEAD OF FROM THE CURRENT DAY"
2020-02-13 09:28:35 +01:00
Winter Flare
f32affdb1c Made Mugs Colorful 2020-02-13 03:26:35 -05:00