Commit Graph

7983 Commits

Author SHA1 Message Date
Fox McCloud
89883a7b28 fixes 2019-04-24 00:49:23 -04:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
variableundefined
b738f9a92f Merge pull request #11283 from Fox-McCloud/emote-refactor
Emote Refactor
2019-04-23 19:44:26 +08:00
Fox McCloud
4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything
Gives the orphans a home
2019-04-21 18:44:38 -04:00
AffectedArc07
ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Fox McCloud
d88411f947 Merge pull request #11255 from Markolie/safe
Safe refactor
2019-04-21 04:04:13 -04:00
Arkatos1
bb985d44d4 Adds cancel button to teleportation scrolls 2019-04-19 15:59:03 +02:00
variableundefined
6125d73d64 Merge pull request #11314 from farie82/windoor-fix
Fixes windoors not spawning electronics once deconstructed
2019-04-18 07:51:13 +08:00
variableundefined
31a2779bae Merge pull request #11259 from Markolie/flukeops
Nuke Ops updates and buffs
2019-04-18 07:16:31 +08:00
joep van der velden
11abbd1ef2 Fixes windoors not spawning electronics once deconstructed 2019-04-17 12:09:20 +02:00
variableundefined
0bc6859d7e Merge pull request #11305 from Fox-McCloud/its-time
It's Time
2019-04-16 19:48:20 +08:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor
Refactors Electrocution
2019-04-16 19:47:42 +08:00
variableundefined
546bd0edf5 Merge pull request #11288 from Fox-McCloud/toxins-remap
Remaps Toxins
2019-04-16 19:47:14 +08:00
Fox McCloud
7f00f8313a It's Time 2019-04-14 18:24:48 -04:00
Mark van Alphen
a9fa2f32e1 Remove infinite claw sharpening 2019-04-15 00:01:08 +02:00
Fox McCloud
58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Mark van Alphen
bfbebca770 Make sure images are qdel'd 2019-04-11 19:44:10 +02:00
Fox McCloud
93118f9d34 Remaps Toxins 2019-04-11 07:24:16 -04:00
Mark van Alphen
8c5847f9ea Code review fixes 2019-04-11 07:22:43 +02:00
Fox McCloud
112129779c Merge pull request #11280 from Ionward/mantles
Adds suit-slot cosmetic mantles!
2019-04-11 00:43:29 -04:00
Mark van Alphen
69aa881c39 Flashbang fix 2019-04-11 05:32:54 +02:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Fox McCloud
c536c55b28 Emote Refactor 2019-04-10 15:42:12 -04:00
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update
The Nations Update Everyone Deserves!
2019-04-09 20:47:34 -07:00
Fox McCloud
879b50fa10 Merge pull request #11253 from Citinited/foamedmetal-fix
Foamed metal fixes
2019-04-09 22:38:37 -04:00
Ionward
ba7491fa49 cleaned up and made all mantles a child of the base mantle 2019-04-09 02:54:06 -07:00
Ionward
a792d46085 adds mantles! 3 public access ones (in default clothes vendor,) and 6 command ones, each in their respective heads' lockers. 2019-04-09 01:06:19 -07:00
Fox McCloud
03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc
# Conflicts:
#	code/game/objects/items.dm
2019-04-07 19:54:14 -04:00
Mark van Alphen
f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
Mark van Alphen
dde5f1c04c Code review fixes 2019-04-07 18:48:34 +02:00
variableundefined
7416eebf7f Merge pull request #11265 from Fox-McCloud/fix-pill-bottles
Fixess Being Unable to Open Pill Bottles
2019-04-07 22:12:01 +08:00
Fox McCloud
c0ca397d8a Fixess Being Unable to Open Pill Bottles 2019-04-07 09:25:45 -04:00
variableundefined
ff8dc59367 Merge pull request #11229 from Fox-McCloud/reagent-tweaks
[Goonchem] Reagent tweaks
2019-04-07 21:22:18 +08:00
variableundefined
34f7e3dc9f Merge pull request #11251 from Fox-McCloud/vending-machine-qol
Vending Machine QOL and Destruction
2019-04-07 21:18:43 +08:00
variableundefined
53d64d818d Merge pull request #11225 from TDSSS/box-revolver
Trick revolver comes in a box.
2019-04-07 21:14:51 +08:00
Fox McCloud
8cf68e7cae Fixes Russian Revolver 2019-04-07 07:37:02 -04:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
Mark van Alphen
a045382fb3 Fixes 2019-04-07 00:42:44 +02:00
Mark van Alphen
6425d6cc40 Refactor tumbling mechanism 2019-04-07 00:34:02 +02:00
Mark van Alphen
be92148517 Safe refactor 2019-04-06 23:20:26 +02:00
Citinited
9f8099637a Foamed metal will no longer turn transit turfs into metal floors; fixes foamed metal floors not having a sprite 2019-04-06 20:48:00 +01:00
Fox McCloud
9bbe5b1887 Vending Machine QOL and Destruction 2019-04-06 06:08:04 -04:00
Fox McCloud
638c225397 Merge pull request #11140 from dovydas12345/Statues
Removes a unneeded dot from diamond statue names
2019-04-06 03:14:58 -04:00
Fox McCloud
282350fb71 Tweaks Foam and Pyrotechnics 2019-04-04 05:06:39 -04:00
variableundefined
cc831667cd Merge pull request #11081 from Kyep/hijack_limits
Syndie Uplink changes (better interface, hijack-only firegrenades)
2019-04-04 09:30:56 +08:00
TDSSS
2ba5ec0228 fake revolver kit creation 2019-04-03 20:43:55 +02:00
AzuleUtama
3bbfcc8755 Cleans up some uplink code for showing descriptions 2019-04-02 20:36:52 +01:00
variableundefined
a552137e07 Merge pull request #11190 from Fox-McCloud/flash-sonic-bang
Flash Powder, Sonic Powder, and Flashbang Refactor
2019-04-02 20:33:17 +08:00
variableundefined
58f253ad33 Merge pull request #11156 from farie82/big-wrapper-fix
Wrapping big objects and welding lockers now takes time
2019-04-02 18:34:05 +08:00
variableundefined
449baf808b Merge pull request #11170 from Fox-McCloud/trick-revolver
Adds Trick Revolver
2019-04-02 18:33:24 +08:00