Ghom
|
7be2602664
|
Merge pull request #11056 from necromanceranne/bloodgunsnotgood
Bullets no longer do equal blood volume deletion to unmitigated damage; replicates #9682
|
2020-02-14 07:54:41 +01:00 |
|
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 |
|
Ghommie
|
e053721820
|
Fix for solar panels/trackers being wonky.
|
2020-02-14 07:15:13 +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 |
|
Hatterhat
|
c8d0cacf51
|
bad recipe
|
2020-02-13 21:08:38 -06:00 |
|
Hatterhat
|
1276453dc4
|
initial commit - preservahyde
|
2020-02-13 21:01:28 -06: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 |
|
kevinz000
|
e8ccf4b6d7
|
fix
|
2020-02-13 16:25:43 -07:00 |
|
kevinz000
|
3865224e78
|
fine
|
2020-02-13 15:40:30 -07:00 |
|
Linzolle
|
790b7bf9cc
|
sanity check
|
2020-02-13 15:20:01 -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 |
|
Artur
|
c01f78b8e8
|
Conflict fix
|
2020-02-13 17:52:28 +02: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 |
|
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 |
|
Ghommie
|
315b0a9645
|
Fixes halved flavor text max length and removing some crappy code.
|
2020-02-13 14:05:40 +01:00 |
|
Ghom
|
fdbef6a93c
|
Update bin.dm
|
2020-02-13 13:10:36 +01:00 |
|
kevinz000
|
863ce5152b
|
Merge remote-tracking branch 'citadel/master' into stuff
|
2020-02-13 04:14:44 -07: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
|
7332fe97b8
|
Update pool_controller.dm
|
2020-02-13 02:06:32 -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 |
|
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
|
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 |
|
Winter Flare
|
f32affdb1c
|
Made Mugs Colorful
|
2020-02-13 03:26:35 -05:00 |
|
kevinz000
|
a8a071851a
|
s
|
2020-02-13 00:32:26 -07:00 |
|
kevinz000
|
f1e0c62141
|
Update gravity.dm
|
2020-02-12 23:59:03 -07:00 |
|
kevinz000
|
c790478a3d
|
Merge pull request #11012 from keronshb/RatvarDrink
Introduces the Ratvarian mixed drink, the CogChamp!
|
2020-02-12 23:58:14 -07:00 |
|
kevinz000
|
5b01691834
|
Merge pull request #11005 from Arturlang/Hypospray_fix
Moves the hypospray mode change to CTRL click
|
2020-02-12 23:57:50 -07:00 |
|
kevinz000
|
4e419eed03
|
Merge pull request #10987 from Ghommie/Ghommie-cit567
Something about missing privates sprites and bad code.
|
2020-02-12 23:56:53 -07:00 |
|
Detective Google
|
c34617d42a
|
Merge branch 'the-p-o-o-l' of https://github.com/Detective-Google/Citadel-Station-13 into the-p-o-o-l
|
2020-02-13 00:12:13 -06:00 |
|
Detective Google
|
b6cbb3f505
|
woo yeah yeah woo
|
2020-02-13 00:12:11 -06:00 |
|
necromanceranne
|
165f46b836
|
goodbye blood bullets
|
2020-02-13 17:05:36 +11:00 |
|
Detective-Google
|
a8aa9ac24b
|
Update code/modules/pool/pool_drain.dm as per ghom suggestion 2
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-12 23:43:32 -06:00 |
|