Commit Graph

18863 Commits

Author SHA1 Message Date
kevinz000
aaa7733cec Merge pull request #10820 from Ghommie/Ghommie-cit542
clown ops uplink consistency.
2020-02-02 01:39:31 -07:00
kevinz000
3fc832fbe7 Merge pull request #10819 from Ghommie/Ghommie-cit541
clown ops infiltrator consistency.
2020-02-02 01:39:08 -07:00
kevinz000
c9de66857e Merge pull request #10833 from Ghommie/Ghommie-cit545
Playback device spam peeve.
2020-02-02 01:38:52 -07:00
kevinz000
664c4cdea9 Merge pull request #10831 from Citadel-Station-13/Ghommie-patch-1
Fixing chaplain armaments beacon edge case.
2020-02-02 01:38:34 -07:00
Ghom
2bb0a0311a Merge pull request #10796 from Tupinambis/StatusBugFix
Status Display Fix: It's About Time
2020-02-02 01:51:07 +01:00
Ghom
d6c36f363e Merge pull request #10817 from IronEleven/ViroStatPort
Updates Virus Symptom Stats to Match TG
2020-02-02 01:41:11 +01:00
Ghom
f6e30ee6aa Merge pull request #10841 from Kraseo/boxing
Fixes being able to pull after wearing boxing gloves
2020-02-01 19:13:30 +01:00
Ghom
d19b7a7695 Merge pull request #10744 from r4d6/Moar-Engines
Moar engines!
2020-02-01 19:11:10 +01:00
Kraseo
d70665a0c3 got asked to do this 2020-02-01 19:03:35 +01:00
Ghom
6ae5ffddb1 Merge pull request #10731 from necromanceranne/howdoiswitchhands
Energy crossbow changed from RNG to static effects
2020-02-01 18:58:03 +01:00
Ghom
d523cfd95e Merge pull request #10806 from Feasel/master
[Balance Patch - Tend Wounds Edition]
2020-02-01 18:54:18 +01:00
Ghom
74ad10355c Merge pull request #10805 from Citadel-Station-13/i-hate-dueling
guns/ammo/projectiles now properly clean up while being deleted
2020-02-01 18:52:47 +01:00
Kraseo
aa2e4299e2 my grug brain took more than 10 attempts to get this to work 2020-02-01 18:51:18 +01:00
Ghom
3337181cac Merge pull request #10352 from Seris02/smchanges
Changes to the way SM handles power related to integrity and max integrity damage
2020-02-01 18:46:10 +01:00
Ghom
051811ed46 Merge pull request #10811 from Arturlang/crafting_componitization
[READY]Ports TG updates to crafting and componentizes it
2020-02-01 18:36:51 +01:00
Ghom
45af9dc013 Merge pull request #10808 from Arturlang/macros_begone
[READY] Ports chem dispenser macro recording
2020-02-01 18:22:57 +01:00
Putnam3145
12f0c35660 Merge pull request #10803 from Seris02/highlightfix
fixes the whitespace that gets created when you have highlighting strings on
2020-02-01 04:15:47 -08:00
Putnam3145
17e08280b1 Merge pull request #10804 from Citadel-Station-13/kevinz000-patch-9
fixes a very likely race condition in dueling pistols
2020-02-01 04:15:32 -08:00
Ghom
ed3ebd16a8 Merge pull request #10830 from Seris02/nomoreglitches
[s] fixes a glitch with the PKA
2020-02-01 10:06:58 +01:00
Seris02
3c8dcbbcd2 merp 2020-02-01 16:02:30 +08:00
Ghommie
c75774e67a Actual var. 2020-02-01 06:20:23 +01:00
Ghommie
ef3789eeb2 Playback device peeve. 2020-02-01 06:18:22 +01:00
Ghom
e7589715a8 Fixing chap armaments beacon. 2020-02-01 05:13:29 +01:00
Seris02
fc70b88b06 actually we only need it here 2020-02-01 11:51:15 +08:00
Seris02
20308b54dd exploit fix 2020-02-01 11:48:55 +08:00
necromanceranne
66862db7ab Last change to this, now the damage is respected by energy armor 2020-02-01 14:07:23 +11:00
ShadeAware
c46c683664 FIXES FANCY SWITCHBLADES
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
2020-01-31 21:12:08 -05:00
Artur
b4763d947e Kills macrotier 2020-02-01 03:03:55 +01:00
Ghom
3519fbc909 F 2020-02-01 02:16:52 +01:00
Ghom
1745308cc5 Forgot about this. 2020-02-01 02:14:14 +01:00
Ghom
c9e315a9e6 Merge pull request #10781 from r4d6/RPD
RPD icon reorder, less building pixelhunting
2020-02-01 01:48:59 +01:00
Ghom
5257ab2e00 Merge pull request #10559 from Seris02/custompie
custom reagent pie smite
2020-02-01 01:46:15 +01:00
Ghom
7fdabe81ab Merge pull request #10776 from Hatterhat/hecksuitgolres
heck suit resistances - goliath resistance and also acid-proof
2020-02-01 01:44:54 +01:00
Ghom
fddd79b466 Merge pull request #10777 from Citadel-Station-13/kevinz000-patch-4
Gangs can now only tag with GANG spraycans, rather than lathed spraycans
2020-02-01 01:44:19 +01:00
Ghom
327bfcac2f Merge pull request #10786 from Commandersand/frick
made the centcomm suit syndies order be a variant with no sensors
2020-02-01 01:42:55 +01:00
Ghom
1c5fe85545 Merge pull request #10793 from Tupinambis/MaskBugFix
Masks are now PROPERLY hidden my headgear that hides masks (Spacesuits, Hardsuits, Rad Hoods, Etc.)
2020-02-01 01:41:36 +01:00
IronEleven
fa7b38d3bd Stat Changes
Changes symptom stats to match tg
2020-01-31 19:03:30 -05:00
IronEleven
d2e6f4abf0 Comment Typo Fix
Might as well fix that while I'm in here
2020-01-31 19:02:59 -05:00
Ghommie
af9060cc15 clown ops uplink consistency. 2020-02-01 00:03:58 +01:00
Ghommie
ab4aa29576 clown ops infiltrator consistency. 2020-02-01 00:02:31 +01:00
Lin
235ac2d27c Merge pull request #10815 from Putnam3145/locales-are-bad
stop it with the unicode spam in the atmos defines
2020-01-31 22:13:56 +00:00
Putnam
e70dac7c54 stop it with the unicode spam
god
2020-01-31 13:35:17 -08:00
Artur
880e8c3e04 Whoopsie 2020-01-31 22:34:01 +01:00
Artur
dd1083e7da How did i fuck up this bad 2020-01-31 18:32:12 +01:00
Artur
d0b03877ea Should be right now 2020-01-31 18:24:49 +01:00
Artur
bcb2bfca02 Why did tg remove this 2020-01-31 18:21:00 +01:00
Artur
8bb0e30036 Initial Commit V3 2020-01-31 18:17:14 +01:00
Lin
4ced8f62fa Merge pull request #10790 from Citadel-Station-13/Ghommie-patch-1
A little load_character() fix: removing gender restrictions for undergarments/hair styles yet again.
2020-01-31 17:03:40 +00:00
Lin
ad4a4b3797 Merge pull request #10782 from Citadel-Station-13/kevinz000-patch-16
nonlethal dueling pistols are now not access locked, lethal ones are now armory locked. also, dueling pistols show their duel datum id (which is added) for better finding when you have many pairs.
2020-01-31 16:58:47 +00:00
Arturlang
d26ca9dbf0 Fixes this 2020-01-31 13:57:30 +01:00