Commit Graph

10406 Commits

Author SHA1 Message Date
phil235
23a3ef7994 Fixes item embedding not working. 2015-08-09 15:57:36 +02:00
Cheridan
346848b875 Merge pull request #11084 from bgobandit/goofbotany
Adds several new reagent reactions to hydroponics.
2015-08-09 02:46:38 -05:00
xxalpha
008c70acea Fixed inbuilt jetpacks dropping when suit is deleted. 2015-08-08 04:05:51 +01:00
bgobandit
7a613fc2b6 Adds several new reagent reactions to hydroponics. 2015-08-07 13:44:13 -04:00
Kevin Chen
0a65e62ce4 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-08-07 12:15:17 -04:00
phil235
bec7be024f Fixes runtime when firer is null. 2015-08-07 15:54:21 +02:00
Jordie
f4b41b99bf Merge pull request #11016 from Core0verload/mmi
MMI ID lock removed
2015-08-07 19:38:27 +10:00
Jordie
63c545346d Merge pull request #10992 from RemieRichards/AlternateWornLayer
Adds alternate_worn_layer
2015-08-07 19:37:52 +10:00
Jordie
0b5223a687 Merge pull request #11041 from phil235/PlasmaCutterChange
Plasma cutter tweaks
2015-08-07 19:35:15 +10:00
Jordie
0287f37405 Merge pull request #11049 from phil235/RunningOnYourBulletsFix
Fixes being able to run into your own bullet
2015-08-07 19:32:06 +10:00
Cheridan
4bf33e17c2 Merge pull request #11056 from KorPhaeron/thismustbetheworkofanenemystand
Guardian Fixes/Ranged Simple Animal  Fixes
2015-08-07 00:33:00 -05:00
KorPhaeron
842339dbc6 More slight nerfs 2015-08-07 00:28:06 -05:00
KorPhaeron
616f3da3f4 Extra punctuation 2015-08-07 00:21:14 -05:00
Remie Richards
18d4a55a95 Merge pull request #11027 from MrStonedOne/patch-26
Admins can now use marked objs with atom proc call
2015-08-07 03:41:01 +01:00
KorPhaeron
fc218bcf84 Nerfs Healer, adds checks to healer/bomb 2015-08-06 18:55:15 -05:00
Kevin Chen
57870d14f1 Changes uranium to radium 2015-08-06 14:26:48 -04:00
KorPhaeron
97543db0ed Words 2015-08-06 10:21:13 -05:00
phil235
5fdf491441 Merge pull request #11034 from francinum/patch-3
Fixes Orion Trail design datum
2015-08-06 16:56:17 +02:00
phil235
b90fcaa765 Remove mech immobilization when shooting.
Changed the fix to delete bullets the user is on the target loc while he fires so we don't get floating bullets.
2015-08-06 16:31:30 +02:00
KorPhaeron
e9bec804a8 Ranged Version gets its own projectile 2015-08-06 00:13:36 -05:00
KorPhaeron
a8f9ddf56c Fixes ranged simple animals 2015-08-05 22:27:36 -05:00
KorPhaeron
eb6a72a501 Guardian Fixes
Creating bombs with dense objects will make the bomb dense

The battlecry will only activate on mobs so you can't spam it on stuff with no clickdelay

Slightly nerfed the fire type (takes more damage, spreads less firestacks). Will probably need further balancing.

Using the communicate verb will now display the message for the user as well so you can keep track of your conversations better.
2015-08-05 22:00:08 -05:00
Remie Richards
6e41222599 Merge pull request #11009 from KorPhaeron/korsbizzareadventure
Guardian Spirits/Parasitic Nanomachine Swarm/Scarab Hive
2015-08-06 02:32:40 +01:00
KorPhaeron
cee73fb4fb Don't need those anyway 2015-08-05 20:30:09 -05:00
KorPhaeron
593e9a1d7b Check for null input 2015-08-05 20:26:11 -05:00
KorPhaeron
e37efcc9c8 Ancient code 2015-08-05 20:19:25 -05:00
KorPhaeron
e714ecebcd Removes nonfunctional bolding 2015-08-05 20:14:54 -05:00
KorPhaeron
e28a0857b2 More efficient disguising 2015-08-05 20:14:22 -05:00
phil235
207fbc7cb6 Fixes being able to run into your own bullet (both as a mob or inside a mech). 2015-08-06 01:21:55 +02:00
phil235
e2ca2de4b2 Plasma cutter's fire rate is now a bit slower but its projectile can pierce multiple asteroid walls(2 for normal cutter, 3 for advanced). Its range is no longer reduced in pressurized environment (so the projectile is no longer invisible). 2015-08-05 21:58:19 +02:00
KorPhaeron
5612860c94 I can't spell 2015-08-05 14:51:43 -05:00
KorPhaeron
edf99daf4d New Guardian Type and fixes
Bomb type that sets booby traps.

Various value tweaks, bug fix, death messages.
2015-08-05 13:50:51 -05:00
francinum
026e20f968 Design Datum fix 2015-08-05 12:48:51 -04:00
Cheridan
cd2faf72b5 Merge pull request #10988 from PatchouliKnowledge/Appendifixis
Fixes appendicitis magically self-curing
2015-08-05 05:38:46 -05:00
KorPhaeron
50a5877646 Another update
Fixed the bluespace one telporting APCs around, added sprites for the
ghost version, fixed naming.
2015-08-05 03:13:57 -05:00
Jordie
d18f47f65c Merge pull request #10981 from lordpidey/lordpidey_spraytan
Adds new chemical: spray tan
2015-08-05 15:02:43 +10:00
Jordie
933cdc1c0c Merge pull request #11002 from AnturK/bizzaro
Some action button fixes
2015-08-05 14:50:23 +10:00
Jordie
9bc07812e1 Merge pull request #10967 from astralenigma/digfix
Digging gets the same progress bar as minning.
2015-08-05 14:35:39 +10:00
Jordie
23d251594d Merge pull request #10947 from bgobandit/cutebiology
Adds a water reaction to gold slimes + tweaks blacklist.
2015-08-05 13:56:23 +10:00
Jordie
723d18400e Merge pull request #10963 from astralenigma/petcollarfix
Fixes the renaming collar.
2015-08-05 13:55:47 +10:00
Jordie
cb469e242f Merge pull request #10871 from Xhuis/shadowling_update_3
Shadowling Update III
2015-08-05 13:43:16 +10:00
Remie Richards
b67657787a Fixes Cyborg Modules being permanently mouse_opacity 2, preventing you from turning them on/off. 2015-08-05 04:28:34 +01:00
Kyle Spier-Swenson
f4c4a3399c Admins can now use marked objs with atom proc call 2015-08-04 19:10:00 -07:00
oranges
5c3a311dd4 Merge remote-tracking branch 'upstream/master' into Appendifixis
Conflicts:
	code/modules/surgery/appendectomy.dm
2015-08-05 13:58:21 +12:00
KorPhaeron
69d758f897 Merge branch 'korsbizzareadventure' of https://github.com/KorPhaeron/kortg into korsbizzareadventure 2015-08-04 20:00:59 -05:00
KorPhaeron
a82d9c5a0f More updates
Punching variant can choose battlecry, removed ventcrawl from scout
(weird interactions with incorporeal move), added an explosive act.
2015-08-04 20:00:45 -05:00
PatchouliKnowledge
de8c10e6c7 Merge conflicts pls go 2015-08-05 01:08:52 +03:00
phil235
4e5be438cd Merge pull request #10990 from RemieRichards/StorageUnequipUsability
Storage Item Click Usability Improvement
2015-08-05 00:07:01 +02:00
Remie Richards
06a4be7708 Applies the same "NO MORE PIXEL HUNTING" fix to the Cyborg Module Inventory too. 2015-08-04 23:04:19 +01:00
Xhuis
72a5c7bf5e Updates surgery 2015-08-04 15:11:53 -04:00