Commit Graph

18772 Commits

Author SHA1 Message Date
oranges
fd7e8eb3bd Don't redestroy a tesla ball on stop orbit (#22482)
Destroy can cause the parent ball you're orbiting to also be destroyed,
which calls stop orbit on your ball, which then caused you to get
destroyed again, this fixes that while still guarding against the case
the original !loc qdel code was added for - see pr #15486
2016-12-27 16:16:59 -05:00
Incoming5643
873799f655 Revenge of Uplink Discount System (#22429)
* Traitor discounted item system! Every uplink will have three random items on sale for between 25% and 75% off (strongly weighted towards smaller deals). All these items are single purchase only.

* Whoops, accidentally used a feature not in the travis build of dream maker.

* Featuring Remie from code optimization
2016-12-28 09:06:27 +13:00
Joan Lung
2748b812b8 Misc Guardian changes (#22434)
* Chaos guardians now ignite on attack and cause a hallucination on bump

* hup

* bleh.
2016-12-28 09:04:50 +13:00
Firecage
7587c141d7 Divides species_types.dm into different files due to code bloat (#22461)
* Divides species_types.dm into different files due to code bloat

* Moves slimepeople code into jellypeople code.

* changes several |= to -=
2016-12-28 09:03:14 +13:00
oranges
771c1c088a Merge pull request #22464 from ChangelingRain/moveconstructiondefines
Applies construction defines and default_unfasten_wrench() to some singularity machinery
2016-12-28 09:02:31 +13:00
oranges
9d1852c89a Merge pull request #22465 from Firecage/syndi_spacesuit_helmet
Fixes the descriptions on the Syndi Spacesuit and Helmet.
2016-12-28 09:01:37 +13:00
oranges
f986cb36f7 Merge pull request #22472 from Incoming5643/patch-31
Fixes the charge spell being too miserly with charges
2016-12-28 08:59:38 +13:00
oranges
c6e6e555de Merge pull request #22474 from Firecage/Thermo_of_gods_and_freezers
Makes it so the default thermomachine board no longer builds nothing.
2016-12-28 08:59:21 +13:00
oranges
ae18f59aad Merge pull request #22477 from Firecage/Riot_helmet_food
Fixes not being able to drink/eat with a visor-up Riot Helmet.
2016-12-28 08:58:17 +13:00
Joan Lung
2d72994cf8 Merge pull request #22405 from lzimann/datumemotes
Refactors the emote code into emote datums.
2016-12-27 11:19:10 -05:00
Lzimann
520f7db110 Adds a new proc, select_param, you can override it if you need specific checks in the param selection. 2016-12-27 14:05:39 -02:00
Lzimann
5a585fc124 Removes some leftover debug messages.
Aflap is now a child of flap, each having a wing opening/closing timer, also improved the code there a bit.
Adds a stat_allowed var(all emotes are default to CONSCIOUS).
2016-12-27 07:44:49 -02:00
Joan Lung
2c39711ab5 New Hierophant sprites (#22404)
* New Hierophant sprites

* actual boss sprites: MAYBE

* byond does not actually catch this error

* anomaly

* I'm a sucker for stupid-ass puns
2016-12-26 19:30:37 -05:00
Joan Lung
5aca68ccdf Wizards can now buy magic guardians for 2 points (#22435)
* Wizards can now buy magic guardians for 2 points

* a touch of wizard handling
god damn it spell magic men

* i swear i removed that

* asshole thaumaturge

* this is a good time to not mindswap you idiot, you fool
2016-12-26 19:13:00 -05:00
Firecage
758e7cdc7a adds ..() to /New() 2016-12-26 23:03:26 +02:00
Cruix
20394282ff Fixed some two-handed weapon bugs (#22457)
* Fixed being able to hold twohanded-required items in one hand
Fixed dualsabers changing their weight_class and hitsound when unsuccessfully wielded

* Fixed ctf flags being unpickupable
2016-12-27 09:13:46 +13:00
jughu
afccd6787d Hhwhhe (#22463) 2016-12-26 11:48:45 -05:00
Firecage
75f157e099 Fixes not being able to drink/eat with visor-up Riot Helmet. 2016-12-26 17:20:35 +02:00
Firecage
a7afe5adba Makes it so the default thermomachine board no longer builds nothing. 2016-12-26 10:07:17 +02:00
Incoming5643
a57cb1ec21 Fixes the charge spell with being too greedy with charges 2016-12-26 01:12:07 -05:00
oranges
1dff0b8457 Merge pull request #22442 from coiax/fix-22424
[FIRST OF THE FREEZE] Animals no longer heal in space
2016-12-26 14:54:01 +13:00
oranges
0010f34a1c Merge pull request #22432 from coiax/stops-sentient-event-complaining
Adds correct returns to sentience event
2016-12-26 14:53:24 +13:00
oranges
84478b02f6 Merge pull request #22469 from XDTM/IsThisTheEnd
Fixes kudzu (i hope)
2016-12-26 14:43:49 +13:00
oranges
3e61cd3202 Merge pull request #22448 from XDTM/Cautery
Fixes Organ Manipulation cautery step not healing the patient
2016-12-26 14:42:12 +13:00
oranges
382342b561 Merge pull request #22444 from XDTM/MedHUD
Fixes HUD implants
2016-12-26 14:41:47 +13:00
Leo
d6799e2c37 Adds a trashbag check to janicart (#22443)
* Adds a trashbag check

* Gotta close strings properly
2016-12-26 14:40:37 +13:00
XDTM
bf9492b0f3 Maybe fixes kudzu 2016-12-26 01:45:49 +01:00
Firecage
b3db7e7f6e Fixes the descriptions on the Syndi Spacesuit and Helmet. 2016-12-25 22:39:16 +02:00
Lzimann
d0fa89a452 Adds a way to override emote_type(mainly for custom emote). Also moves the implant trigger to all livings instead of carbon only. 2016-12-25 17:32:19 -02:00
Joan Lung
a9d05c09f2 Applies construction defines and default_unfasten_wrench() to some singularity machinery 2016-12-25 10:28:35 -05:00
Lzimann
7bf4aea58b Merge branch 'master' of https://github.com/tgstation/-tg-station into datumemotes 2016-12-25 13:22:56 -02:00
bgobandit
aca5dd84b2 Easy fixes/tweaks. (#22348)
* Fixes a misleading message

* Fixed more bugs, did kor's shit

* Fixes holodeck  monkey message

* does the needful
2016-12-25 16:57:34 +13:00
xxalpha
8e80afbf86 Map Conflict Fixing Helper (#22421)
* Trimmed down map_merge function to be simpler and straightforward, no
more recycling keys;
New function get_key, looks up a dict key by abusing python;
New function key_int_value, converts a base 52 key to a base 10 integer
value;
Map helper functions are no longer dependent on global values;
Reorganized map_helpers.py;

* Added Map Conflict Fixer Helper;
Changed parse_map function to accept a map's raw text instead of a file
path;
Tweaked some map merger code;

* Map Conflict Fixer readme.md entry

completed readme.md

more

Removed debug code
2016-12-25 16:25:54 +13:00
Joan Lung
95af0534f6 MMI'd clockcultists put in AI cores will properly lose clockcult status (#22369)
* MMI'd clockcultists put in AI cores will properly lose clockcult

* uuuuugh

* fix the core while we're at it

* "

* mrrp

* this will also follow you around

* hmm
2016-12-25 16:18:55 +13:00
oranges
41a9f7d293 Merge pull request #22387 from ChangelingRain/borgspear
Fixes cyborg ratvarian spears breaking
2016-12-25 16:18:36 +13:00
oranges
2e936a0db7 Merge pull request #22425 from Shadowlight213/branchnametbd
Fix bundle
2016-12-25 16:14:33 +13:00
XDTM
417ec9baba fix surgery 2016-12-25 01:33:18 +01:00
jughu
4426afe06f SHENZI DID YOU FORGOT THE DET COATS? (#22412)
yes i did! I DID INDEED!!!
2016-12-24 19:00:13 -05:00
XDTM
751be17523 Fixes HUD implants 2016-12-24 23:44:44 +01:00
Jack Edge
3c3e8cfd43 Animals no longer heal in space
Fixes #22424.

My bad, it turns out adjustHealth() adjusts health DOWN.
2016-12-24 22:09:48 +00:00
AnturK
85669e6746 Implants work on /living mobs (#22392) 2016-12-24 13:44:34 -05:00
Cheridan
35362048c0 Merge pull request #22382 from ChangelingRain/uncompromising
Sentinel's Compromise will no longer heal toxin damage on slimepeople
2016-12-24 11:44:55 -06:00
Jack Edge
a257df3e45 Adds correct returns to sentience event
I coded the ghost_role template, and yet I failed to code a new event
correctly.

I have fixed my mistakes, the sentience event no longer produces admin
complaints about bugs.
2016-12-24 13:31:20 +00:00
ExcessiveUseOfCobblestone
d0d3f94710 Update seeds.dm (#22407)
> you can make 100 weeds spawn 100% every update

no wonder this was broken.

🆑 Cobby
:bugfix: Fixed Kudzu
:bugfix: Fixes an issue where you can never get below 2 production without disks.
/🆑

This changes weedrate to cap at 10 [meaning at most 10 weeds can spawn at a SINGLE time]
changes weedchance to cap at 67% [meaning at most there's a 2/3 chance `weed_rate` weeds will spawn]

also changes production to 1, since the minimum has always been 1.
2016-12-24 18:57:40 +13:00
Shadowlight213
5dd264102e Adds arrival shuttle to radstorm protected areas
Fixes spider structures having null armor
Fixes division by 0 with hellcan
Fixes runtime in automatons
Fixes runtime with recharger in modular computer destroy
Fixes runtime in power monitor
2016-12-23 18:50:10 -08:00
Lzimann
b1f445ece6 Adds the help emote and removes debug messages. 2016-12-23 23:45:01 -02:00
Kyle Spier-Swenson
92cb0e668b [s]Throttles botcall's call bot command (#22409)
* Throttles botcall's call bot command

It will now make the ai wait until the bot's astar operation has finished before it can send another call bot command (to any bot).

There is a secondary time out of 90 seconds in case the astar operation just never returns, this is mainly a failsafe, the longest astar operation i've seen is 47 seconds.

* Update ai.dm
2016-12-24 13:18:58 +13:00
Lzimann
350bc7d597 Finishes brain emotes
Fixes simple animal attacks(when no damage)
Re-adds sounds to some alien emotes.
2016-12-23 20:12:43 -02:00
Joan Lung
e3a36b4f6d Merge pull request #22357 from coiax/library-of-brass-or-blood
Library now has blood and brass (digitally)
2016-12-23 11:49:16 -05:00
Jack Edge
58efb041a6 Merge branch 'library-of-brass-or-blood' of github.com:coiax/-tg-station into library-of-brass-or-blood
Conflicts:
	code/modules/library/lib_machines.dm
2016-12-23 16:14:21 +00:00