Commit Graph

15709 Commits

Author SHA1 Message Date
Joan Lung 1313d45aff Merge pull request #17565 from KorPhaeron/cakehat3
Nerfs cakehat
2016-05-13 11:52:32 -04:00
Cruix d97b15ef8d Fixed some foam dart bugs (#17563)
* Fixed foam darts being reset when fired
Added the ability to remove pens from foam darts
Foam darts with pens inside them are no longer destroyed on being fired

* Fixed foam dart duplication bug

* Added destroy procs to projectiles and foam darts.
2016-05-13 13:27:19 +02:00
Jordie c66c8b9f63 Merge pull request #17531 from Shadowlight213/cleanbetter
Improves bot scanning
2016-05-13 14:16:23 +10:00
Joan Lung f95e956d88 Merge pull request #17429 from Shadowlight213/ctfnotify
Adds a notification for ghosts for enabling or disabling CTF
2016-05-12 23:59:03 -04:00
Joan Lung bfbb76df0b Merge pull request #17477 from KorPhaeron/hugbox
Makes drakes more hugbox
2016-05-12 20:04:45 -04:00
KorPhaeron eae335e281 Forgot a commit 2016-05-12 03:51:56 -05:00
KorPhaeron ec5291471d Removes warning 2016-05-12 03:42:31 -05:00
KorPhaeron ce293fe6da Dragon Fixes 2016-05-12 03:25:36 -05:00
KorPhaeron d93f87cf96 Removes """""humour"""" 2016-05-12 03:18:05 -05:00
Shadowlight213 a2aa7c6a0e Fix 2016-05-11 21:39:02 -07:00
TechnoAlchemist 4705efa6da Adds new items to the mining vendors. (#17362)
* Adds new items to the mining vendors, also adds tracking implanter since that didn't exist before.

* woops

* Fixes tracking implants for miners, makes medipens not OD you on tricord.

* Actually doesn't OD on tricord now

* Chemical changes.

* Upgraded the jaunter into the wormhole lifebelt

🆑 coiax
rscadd: The Free Golems have developed the jaunter into the  wormhole
lifebelt, which automatically teleports the user when they fall in a
chasm or suffer a major medical emergency. Must be worn on the belt to work.
/🆑

Please don't mistake a random teleportation in crit for saving a user's
life, the Supply channel gets a notification, but suit sensors are
required to find them, and there's no guarantee the location picked is
safe (for example, the Toxins Test Site is a valid jaunt destination,
along with in the middle of the slime cages in Xenobiology).

* Adds modification kit.

* Golem ship now has its own /area

And a bluespace beacon.

* 5 tick medijaunt, no radio, golem jaunters + areas

The number of ticks before a medical emergency jaunt happens is now
five. No radio message is produced.

Free Golems now have no restrictions on what they can purchase. Wormhole
jaunters now specifically drop golems near their ship.

* Modkits remove the race restrictions from KAs.

* Buffs buffs buffs

I'd say something, but I'm sure I'd regret it later.

* Advanced lifebelts, golem superiority

* Removes modkit from minervendors, adds modkit to RnD!

* COMPILE DAMN YOU!!

* I made it compile

* Honor to my country, not to you :(

* fuck

* h-haha?

* Kor you know I would never actually ban you

* i could personally care less for HBls adminning style
2016-05-11 22:19:47 -05:00
lordpidey 08735fa733 Employment contracts can once again be copied. (#17510)
* Employment contracts can once again be copied.

* Removes erroneous argument.
2016-05-11 22:17:02 -05:00
Incoming5643 2368de554f Healing wand/staff regenerate limbs on use (#17532)
* Fully_heal regenerates limbs

* Working in the browser is such a bad idea

* Seriously not a great idea

* Don't do this at home kids
2016-05-11 19:27:18 -05:00
Cheridan 58319051dd Merge pull request #17558 from phil235/WashingFix
Fixes washing machine
2016-05-11 16:29:06 -05:00
Shadowlight213 320bb39eba Removes abductor ability to use guns. (#17515)
* Removes abductor ability to use guns.
Removes agent starting out with an alien blaster

* removes comment

* Makes Abductors able to use alien pistol

Alien pistol now has ALLOW_ALL trigger guard to overcome abductor's
natural NOGUN.

Pistol now starts in the backpack, and the wondertool on the belt.

In addition:
 - Replace multiple copies of IsAbductor() with a single isabductor()
   proc in code/__HELPERS/mobs.dm
 - Adds icon for alien firing pin
 - Adds abductor span for ayylien communication
2016-05-11 20:28:52 +01:00
Joan Lung 60237bbb31 Merge pull request #17548 from coiax/fix-17497
Fix #17497; moves bardrone from map to drone types
2016-05-11 09:29:55 -04:00
Jordie ea52cee578 Merge pull request #17511 from ChangelingRain/bootsuit
Replaces miner jackboots with mining boots
2016-05-11 22:59:36 +10:00
Jordie be58aedcff Merge pull request #17549 from ChangelingRain/spaceshade
Shades can move in space
2016-05-11 22:59:28 +10:00
Jordie 94b5d1c088 Merge pull request #17527 from ChangelingRain/glowyhealything
Adds healy glows to cult pylons and the medbeam gun
2016-05-11 22:51:22 +10:00
Nerd Lord 930b9ba91b sanity? 2016-05-11 08:44:33 -04:00
Jack Edge edc47a564a Switches the naming booleans around 2016-05-11 12:56:02 +01:00
KorPhaeron 0c996d538f Cake Hat 2016-05-10 23:09:27 -05:00
Robustin d1a2d1d0bd SLIP-SANITY (#17096)
* Chemo

* CHEMO

* Chemo

* Update growninedible.dm

* Corrected math

* decimals needs 0's

* NOW EVERYBODIES HAPPY YAYYY

* Updated Botany nerf

* Conflict correction & tweaks
2016-05-10 22:52:05 -05:00
Cheridan 915535e69e Merge pull request #17514 from KorPhaeron/explosion
Explosive dismemberment fix
2016-05-10 20:30:34 -05:00
phil235 1b24cc7e6a Moved crayon code out of toys.dm and into crayons.dm
Fixes being able to throw kinetic grabs.
Fixes washing machine code being shit. Also fixes clothes coloring via washing machine being broken.
2016-05-10 22:53:47 +02:00
Jack Edge 0b0d922f98 Moved Bardrone into drone types 2016-05-10 21:00:11 +01:00
Joan Lung a4f1318d88 Merge pull request #17496 from coiax/pie-pie-pie
Cream pie map edits
2016-05-10 11:06:41 -04:00
lordpidey 07daf80144 Xenobio slime console now gives error messages upon failure.
* Fixes #16998

* Changes spacing within output.
2016-05-10 09:44:34 -05:00
Nerd Lord 36504eb571 shades in spaaaace 2016-05-10 07:39:13 -04:00
Jack Edge 7bb60725bb Fixes #17497
Drones now have numbers by default unless specified otherwise.
2016-05-10 12:09:29 +01:00
Jordie d9bd933f4e Merge pull request #17494 from coiax/die-facehugger-bug
Fixes facehugger related equipping issue
2016-05-10 18:50:15 +10:00
Jordie 190bc68608 Merge pull request #17492 from coiax/stampy-the-stamp
Cargo can order stamps; camo stamp has action button
2016-05-10 18:50:04 +10:00
Cheridan 8f6a5f7f1f Merge pull request #17508 from KorPhaeron/cutandtake
Continues to inch dismemberment threshhold downwards
2016-05-10 02:26:21 -05:00
Shadowlight213 8112079ff5 Fixes 2016-05-09 23:06:41 -07:00
Shadowlight213 ff581bc902 Changes 2016-05-09 21:28:57 -07:00
Cheridan 2ba6208a64 Merge pull request #17414 from KorPhaeron/hackycodeforahackyplanet
Fixes bad atmos on lavaland
2016-05-09 23:13:31 -05:00
Cheridan a7fa685609 ghosts can watch animals having SEX (#17481)
* hush hush eye to eye

* Breeding mobs ignore mobs of the same faction for the purposes of alone checks.

* Dogs are in the dog faction

* It has to be list("dog")
2016-05-09 21:57:19 -05:00
Shadowlight213 4685a929e1 Improves bot scanning
They will first check their adjacent tiles before doing a full scan
Additionally, they will also skip a target if they see another of their kind on the same turf.
2016-05-09 18:01:23 -07:00
Nerd Lord da10d5c143 Adds healy glows to cult pylons and the medbeam gun 2016-05-09 19:37:15 -04:00
Remie Richards 147f3380e0 fixes a runtime with clothing vars
* fixes a runtime with clothing vars

* no ghosts, too spooky
2016-05-09 16:50:46 -05:00
KorPhaeron e4559ff03e Removes redundant line 2016-05-09 15:54:50 -05:00
Nerd Lord 43073b2dcf conflict yourself 2016-05-09 16:39:50 -04:00
Cheridan ee4d3785a3 Merge pull request #17484 from ChangelingRain/fixrobustinscode
Cleans up some cult code
2016-05-09 15:35:14 -05:00
bgobandit 029c5bded9 Even more Cards Against Spess tweaks. (#17398)
* alt-click functionality, even more cards

* more cards and shit

* canusetopic
2016-05-09 15:00:40 -05:00
bgobandit 28e99253c5 Alt-clicking abandoned crates no longer makes them explode. (#17433)
* Alt-clicking no longer explodes abandoned crates.

* humies only

* canusetopic to satisfy the kor
2016-05-09 15:00:14 -05:00
Nerd Lord c75b455e36 unrobustin fixes 2016-05-09 15:45:31 -04:00
Nerd Lord 4f834abf58 fancy steel-toed boots 2016-05-09 15:34:26 -04:00
Shadowlight213 d8d0920bb4 Changes to use initial instead of var 2016-05-09 10:46:02 -07:00
KorPhaeron 290067cfd9 Fixes explosive dismemberment 2016-05-09 12:09:53 -05:00
Jordie a406abfaa7 new sprites for tesla gun (#17509) 2016-05-09 11:40:32 -05:00