 GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
TrilbyspacecloneandGitHub
|
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 |
|
|
kevinz000andGitHub
|
14add89a5e
|
Update heart.dm
|
2020-02-13 01:52:00 -07:00 |
|
|
kevinz000andGitHub
|
e4f6131dcf
|
Update brain_item.dm
|
2020-02-13 01:51:16 -07:00 |
|
|
GhomandGitHub
|
a7d29ae830
|
Merge pull request #10973 from Trilbyspaceclone/put-a-pin-in-it
Station Locked firing pins
|
2020-02-13 09:42:22 +01:00 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
bfdef7fcfd
|
Merge pull request #10755 from kevinz000/attack_chain
small refactor to melee_attack_chain
|
2020-02-13 09:39:07 +01:00 |
|
|
GhomandGitHub
|
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 |
|
|
kevinz000andGitHub
|
f1e0c62141
|
Update gravity.dm
|
2020-02-12 23:59:03 -07:00 |
|
|
kevinz000andGitHub
|
c790478a3d
|
Merge pull request #11012 from keronshb/RatvarDrink
Introduces the Ratvarian mixed drink, the CogChamp!
|
2020-02-12 23:58:14 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
necromanceranne
|
165f46b836
|
goodbye blood bullets
|
2020-02-13 17:05:36 +11:00 |
|
|
keronshb
|
5d32775170
|
Changes the desc a little
Changes it to "When the cult ascends, so does the spell, it burns and throws back the victim" Thanks Justin!
|
2020-02-12 21:31:48 -05:00 |
|
|
keronshb
|
7949c4fa01
|
Changes cult stunhand when halos are out
Turns the stunhand into a burn + knockback hand. So it remains more defensive than offensive.
|
2020-02-12 21:24:12 -05:00 |
|
|
ShadeAware
|
195760e572
|
h
|
2020-02-12 16:37:00 -05:00 |
|
|
ShadeAwareandGitHub
|
0f603f2aff
|
Fixes icon state for the refill
Thank you for the catch, Ghommie.
|
2020-02-12 16:34:16 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
34d8381b67
|
Update blood_drunk_miner.dm
|
2020-02-12 15:21:17 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
0bd1357e5f
|
flour
|
2020-02-12 15:03:15 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
1ce9232958
|
Update cereals.dm
|
2020-02-12 15:00:08 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
ba8c7b191c
|
Update stickman.dm
|
2020-02-12 14:52:24 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
7cd3a51c4e
|
Update pistol.dm
|
2020-02-12 14:48:53 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
4b880276d8
|
Update emergency.dm
|
2020-02-12 14:41:38 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
b7c3582d86
|
Update outfit.dm
|
2020-02-12 14:29:19 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
551a2593d4
|
Update color.dm
|
2020-02-12 14:28:57 -05:00 |
|
|
|
49a7657404
|
Correction
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-12 14:26:29 -05:00 |
|
|
GhomandGitHub
|
942f3f28be
|
Merge pull request #10994 from DeltaFire15/narsierunefix
Mom said its my time to scribe Nar'Sie (Alternatively: Nar'Sie runes no longer take half the time (or even less) to scribe on runed floor)
|
2020-02-12 16:51:38 +01:00 |
|
|
GhomandGitHub
|
2674fa6efc
|
Merge pull request #11043 from Seris02/apcthingfix
fixes apc icons
|
2020-02-12 15:35:01 +01:00 |
|
|
Artur
|
21ce2242ac
|
Conflict fix
|
2020-02-12 16:21:29 +02:00 |
|
|
Seris02
|
eb5835f668
|
fixes apcs
|
2020-02-12 21:35:51 +08:00 |
|
|
Artur
|
2bd8499b94
|
We shallnt want mass production.
|
2020-02-12 14:28:35 +02:00 |
|
|
Artur
|
788d8c5873
|
Just in case.
|
2020-02-12 14:13:26 +02:00 |
|
|
Artur
|
0fdcfc8660
|
Works now.
|
2020-02-12 14:02:09 +02:00 |
|
|
Artur
|
a0adf64c6c
|
Lets see if it works now
|
2020-02-12 12:52:36 +02:00 |
|
|
GhomandGitHub
|
8c2801fda6
|
Merge pull request #11018 from Citadel-Station-13/kevinz000-patch-4
EMPs now function as intended and mute pAIs for 3 minutes, not 60 minutes.
|
2020-02-12 11:14:27 +01:00 |
|