Commit Graph

32161 Commits

Author SHA1 Message Date
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
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
Kyle Spier-Swenson d654029951 Fixes vv icon weirdness (#22454)
If it still happens after this, it's a byond bug.

These files are cleared when ds exits and every now and then by byond
2016-12-26 18:44:54 +01:00
jughu afccd6787d Hhwhhe (#22463) 2016-12-26 11:48:45 -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
oranges 58e21ba5a8 Merge pull request #22433 from lzimann/lzimann-patch-1
Fix lollipop dispenser message
2016-12-26 14:39:49 +13:00
XDTM bf9492b0f3 Maybe fixes kudzu 2016-12-26 01:45:49 +01:00
Joan Lung 72716081f9 Fixes converting the AI (#22467) 2016-12-25 17:23:42 -05: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
oranges a5a5dcdeba Merge pull request #22416 from Militaires/kill_me
fixes my glass message tweak fuck-up
2016-12-25 16:20:03 +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
ExcessiveUseOfCobblestone 803e084e8e Update minerals.dm (#22399)
Previously, obtaining points from the gulag would be very difficult since you would have to mine glass [which is only one point a pop] or test your luck at mining for minerals, the best you could get is iron and MAYBE another mineral which had a 1/>100 chance.

This hopes to alleviate the gulag sentences just a bit and make the 1:100 ratio more reasonable, while also providing useful materials for science [since they probably got enough metal from normal mining].

Yes, I DID add gibtonite for them to blow themselves up with.

🆑 Cobby
:tweak: Ups Non-Iron mineral chance for the gulag portion of lavaland. Now the 1 minute : 100 Point ratio is more reasonable.
/🆑
2016-12-25 16:17:25 +13:00
oranges 2e936a0db7 Merge pull request #22425 from Shadowlight213/branchnametbd
Fix bundle
2016-12-25 16:14:33 +13:00
Cyberboss ad66d67505 I FUCKED UP 2016-12-24 21:49:03 -05: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
Leo 80852b70f6 Fix lollipop dispenser message 2016-12-24 12:15:41 -02: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
Shadowlight213 86f7afc3c8 all shuttles are now protected 2016-12-23 22:00:46 -08:00
oranges c3014a47d4 Merge pull request #22309 from optimumtact/destroyisconnectedtotheunequipprocunequipisconnectedtothedropprocdropprocisconnectedtotheunweildprocunwieldprocisconnectedtothedestroyproc
Fix a qdel loop in two handed weapons
2016-12-24 18:59:02 +13: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
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
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
Jack Edge e5f077f610 Code review 2016-12-23 16:09:24 +00:00
Cyberboss 3b17a23373 Fixes a hotspot Destroy runtime (#22383)
* Fixes a hotspot Destroy runtime

* The better way
2016-12-23 13:30:50 +01:00
Cyberboss 1503cd8f18 Fixes a cardboardbox runtime (#22384)
* Fixes a cardboardbox runtime

* The better way
2016-12-23 13:30:09 +01:00
XDTM 94db803663 Autolathe x10 (#22359) 2016-12-23 11:10:23 +13:00
Joan Lung 513ce6ec3a Gravity and the supermatter count as critical machines (#22236)
* Gravity and the supermatter count as critical machines

* fragment

* Do the needful myself
2016-12-23 09:49:43 +13:00
kevinz000 2c742c2114 [Ready] FLIGHTPACK PATCH 2 - PROBABLY CONTAINS LARGE AMOUNTS OF SHITTY CODE (#22135)
* ayylmao

* MEKHI JUST GOT A SUBSYSTEM

* ..

* ...

* airlock_bullshit

* ...

* stuff

* kek

* fuq

* fuck...

* GAHH

* finalcommitifucking swear ree

* update

* ...

* honk

* honk

* proc

* update

* fixed
2016-12-23 09:40:48 +13:00
Cyberboss 738aac44e3 Fixes the null excited_group runtime (#22379)
* Fixes the null excited_group runtime

* Milk those cycles

* >Checking for existing vars before making new ones
2016-12-23 09:39:19 +13:00
oranges af6438f3e2 Merge pull request #22377 from Cyberboss/patch-14
Fixes a russian revolver runtime
2016-12-23 09:39:04 +13:00
bgobandit f64e3f8688 Adds a sprite for a survival pod fridge with the panel open (#22375)
* Adds a maintenance panel to the survival fridge panel, will probably need to be fixed

* I'm a goddamn clairvoyant (fixed)
2016-12-23 09:38:46 +13:00
Haevacht b2cf57b555 flan fix+update (#22371)
no longer invisible half the time also now with deadsprites
2016-12-23 09:38:31 +13:00
Joan Lung db9d7553c7 Fixes clockwork walls/floors losing double CV if removed in a particular way (#22365) 2016-12-23 09:38:13 +13:00
oranges 4bd0e515be Merge pull request #22364 from Cyberboss/patch-13
Fixes a gravgen Destroy runtime
2016-12-23 09:37:19 +13:00
XDTM 854eb19e9b Refactors mineral golem code (#22354)
* Improves code

* old comment

* p_their actually

* just in case
2016-12-23 09:35:26 +13:00