Commit Graph

15688 Commits

Author SHA1 Message Date
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
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
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
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
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
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
coiax d563246022 Added the bone tongue to skeletons (#17479) 2016-05-09 18:23:15 +02:00
Razharas 0a3ddc886c Turns tablecrafting into personal crafting (#17341)
* Converts tablecrafting to datums

* Adds crafting.dm

Adds crafting.dm

* Fix merge conflicts

Fix merge conflicts

* Fixes dme

* Fixes returns

Fixes returns

* Only check hands and remove old paths

Only check hands and remove old paths

* Recipe fixes

Recipe fixes

* Removed action button

Removed action button
Added small ui button to inventory near the intent wheel
Removed debug
href_list is not longer /list

* Added adjucent checks

Added adjucent checks

* Snacks now get chems from parts

Snacks now get chems from parts

* Complex food fuckery fixed

Complex food fuckery fixed

* Fixes old recipe

Fixes old recipe

* Fix to infinite loops in reagent extraction

Fix to infinite loops in reagent extraction
It was finding old empty containers and tries to extract from them

* Fixes hands not checking

Fixes hands not checking

* Fixes reagents fucking up

Fixes reagents fucking up

* Even more reagent fuck ups fixed and comments

Even more reagent fuck ups fixed and comments

* Fixes all the shit i could find

Fixes all the shit i could find

* Removes debug and mechs

Removes debug and mechs

* Argument renaming

Argument renaming

* Fixes all argument names

Fixes all argument names

* Final fix of arguments

Final fix of arguments
2016-05-09 18:14:48 +02:00
AnturK 63fd8b2769 Merge pull request #17449 from ChangelingRain/farmhealth
Fixes some simple animal maxhealths
2016-05-09 17:19:09 +02:00
coiax 937e0232bd Ghost role event code cleanup (#17206)
* [WIP] Ninja refactor and quality of life changes

- [ ] Fix ninja mask being hidden by hood
- [ ] Action buttons
- [ ] Ninjas can be spawned with custom objectives easily

* Adding the /datum/event/ghost_role subevent type

* I hate events retrying with insufficient pop

* OH GOD WHY

* Let's just get rid of retries, it's silly

* Morph now uses the ghost_role event

* Operative does as well

Possibility of being bugged due to inability to run age checks on the
testing server, please be cautious.

* Ninjas, spawning, that sort of thing

Wizard diplomats now use the new ghost question system.

* Code review

* Don't ask ghosts if we have enough selected

* Removes map notation from alien spawn

* Removed comment
2016-05-09 17:10:11 +02:00
Joan Lung 1d7d616d87 Blob chemical tweaks (#17464)
* Blob chemical tweaks

* expand only
2016-05-09 17:09:09 +02:00
KorPhaeron 31c03c7360 Dismemberment 2016-05-09 01:48:34 -05:00
Cheridan 11af3176b9 Merge pull request #17472 from Core0verload/mini-egun
Adds miniature energy gun
2016-05-09 01:05:41 -05:00
KorPhaeron 8c2b0089a2 Adds afterchange to turfs 2016-05-09 00:20:19 -05:00
Mercenaryblue d3ed559030 Now we're fixing it (#17499)
Screw you GitHub I win.
2016-05-08 23:52:19 -05:00
PKPenguin321 42e1497022 Adds an alt-click prompt to the descriptions of various objects (#17050)
* adds an alt-click prompt to the description of the detective revolver and the washing machine

* adds italicnotice style to stylesheet.dm

* updates revolver desc to be dynamic with vars, use new style

* actually makes it dynamic

forgot to check for reskinned var

* makes washing machine break a line, use new style

* gives lockers an alt click prompt

* fixes indentation, travis

* moves revolver examine changes to gun.dm

* removes redundant locker message

* makes messages just use the 'notice' span
2016-05-08 19:34:26 -05:00
Jack Edge 4e0ffcca23 Contraband clown pie crate 2016-05-09 00:32:14 +01:00
Jack Edge de0422886d Fixes facehugger related equipping issue
If the facehugger is directly equipped to the mask slot (or Pun Pun
spawned and equipped) it will not infect or do anything.
2016-05-08 23:48:29 +01:00
Jack Edge 7d9f096abd Added action button for camo stamp 2016-05-08 22:14:54 +01:00
KorPhaeron 024df00cd9 Dismemberment tweaks (#17453)
* Dismemberment tweaks

* Lowers some AP to address remies concerns

* Lowers the dualsaber AP again to prevent nonsense from occuring

* Adds HF blade

* Honk Dagger typo fix

* Lowers chaplain AP again
2016-05-08 20:55:44 +01:00
Mercenaryblue cf39b78cc2 The Creampie Throw Update (#17392)
* Items washing banana cream

Allow common methods of cleaning to wash banana cream pie off your face.

* Janiborg cream washing

Janiborgs can now wash cream by running over people.

* Added Creampie Overlay code

When a banana cream pie hits a target mob, it applies a new overlay to
the mob. This overlay can then be cleaned via soap, shower, cleaner
spray, etc.

* Cream Pie Throw Update

When hit by a banana cream pie:
Adds a creamy overlay to various mobs.
Knock targets off for less than a second.
Enable cleaning the overlay via soap, shower, and others means.

* else fix

replace unnecessary if w/ else

* Revert "else fix"

This reverts commit 5dc5707981f8bc312b8e3ac4ce9ab16e7f20c855.

* else fix

* Catch Fix

Catching a thrown cream pie will no longer delete the item in your hands

* Xeno State Creamy Fix

Tossing a cream pie will now apply the appropriate overlay to a dead or
sleeping xenomorph.

Unfortunately, the xenomorph is still able to shake the cream off by
switching state, and it keep pushing the wrong overlay on critical
xenomorphs.

* Human-only code

Simplify code to affect only humanoids.

* Revert "Human-only code"

This reverts commit f74cb0e3af08fc0b793987ed9711dbbfd4d8561b.

* Human Code Only

Pls no Travis

* Optimize code

As requested

* Bug Fix

Overlay no longer unwashable when species get changed via
badmin/magic/etc.
2016-05-08 21:39:23 +02:00
Nerd Lord 4e2cefaddf Merge branch 'master' of https://github.com/tgstation/-tg-station into fixrobustinscode
Conflicts:
	icons/mob/mob.dmi
2016-05-08 14:33:54 -04:00