Commit Graph

18734 Commits

Author SHA1 Message Date
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
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
jughu
4426afe06f SHENZI DID YOU FORGOT THE DET COATS? (#22412)
yes i did! I DID INDEED!!!
2016-12-24 19:00:13 -05: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
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
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
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
oranges
2454156ff0 Merge pull request #22353 from ChangelingRain/saylogged
say_log now has timestamps
2016-12-23 09:34:33 +13:00
coiax
dabcce81ed CTF guns only hurt mobs with CTF armor (#22284)
* CTF guns only hurt mobs with CTF armor

This is moving towards the possiblity of spawning CTF spawns and flag
spawns onto the station without people being caught in the crossfire.

* Debug messages are bad
2016-12-23 09:31:55 +13:00
coiax
243fd295b4 Cyborg upgrade board tweaks (#22211)
* Cyborg upgrade board tweaks

🆑 coiax
add: Cyborg renaming boards cannot be used if no name has been entered.
del: Cyborg rename and emergency reboot modules are destroyed upon use,
and not stored inside the cyborg to be ejected if modules are reset.
/🆑

Reasons: Because being renamed "default name" isn't fun, and it means
you have to hang around to be renamed AGAIN. And for lore/balance/sanity
reasons, you don't get to get the reboot board back after you used it;
try dying less.

* Naming changes, and transformer tweak

- A new unnamed cyborg will copy the user's prefered cyborg name if
possible, defaulting to the old format if there's no preference.
- A rename board with no setting will apply the cyborg's default name,
if one exists, see above.
- Cyborg transformers (from the traitor AI) will no longer destroy all
items.

* Made behaviour more consistent

* Fix spelling
2016-12-23 09:31:03 +13:00
oranges
6eab8df572 Byond stacktraces (#22361)
Byond help
2016-12-22 13:40:52 +01:00
Cyberboss
0b3c5bc578 Fixes a rogue unreturning Destroy (#22362) 2016-12-22 13:16:11 +01:00
Shadowlight213
ec387c8258 Fixes active turfs on ruins (#22339)
Fixes infinite loop and runtime with ruin loader running out of ruins to pick from
2016-12-22 09:11:38 +01:00
Cheridan
6f603fbfbb Merge pull request #22376 from MrStonedOne/patch-272
Removes a bunch of unneeded proc calls from excited group processing
2016-12-22 00:05:58 -06:00
Leo
9762c5c546 Fixes hydro's winter coat hood bad icon (#22368) 2016-12-21 12:29:22 -05:00
Joan Lung
bdee8e9c77 Fixes cyborg ratvarian spears breaking 2016-12-21 12:25:24 -05:00
Joan Lung
6bcba9d718 This is, in fact, way easier 2016-12-21 10:14:59 -05:00
Joan Lung
063c843411 Fixes Wraith Spectacles not giving servants xray vision until toggled (#22333) 2016-12-21 09:23:53 +01:00
Cyberboss
74c7634fca Fixes a russian revolver runtime 2016-12-21 01:48:43 -05:00
Kyle Spier-Swenson
d315de1ada Removes a bunch of unneeded proc calls. 2016-12-20 22:14:53 -08:00
jughu
5e6a6011e1 Adjust cargo crate prices (#22318) 2016-12-20 21:57:51 -06:00
Kyle Spier-Swenson
2243ab6036 [READY]Parallax (#22315)
* Ports Space Parallax from vg/yogs

* KILL ME

* fuck shit

* fixes

* rgfkbjhkefrhjkfrejhkfds

* Parallax, part 2.

* Gotta get these defines in before remie notices!

* DAMN IT! SHE FOUND ONE!

* fixes orbits

* fix orbits take 2

* Fixes some things with parallax

* Refactors parallax shuttle animations.
2016-12-20 21:55:10 -06:00
Cyberboss
e4296736d8 Fixes a gravgen Destroy runtime 2016-12-20 16:39:23 -05:00
Cyberboss
ac1b6b1a31 Readds some of the harder to access freon sources (#22181)
* Revert "Freon Removal"

* Implements XDTM's fix
2016-12-21 10:04:55 +13:00
Joan Lung
c0443a69d2 EMPs will generally fuck up clockwork structures (#22279)
Geis bindings will break, powered structures will disable and consume power, clockwork obelisks will cut off gateways, interdiction lenses will disable for a long time, caches and ocular wardens will force-unanchor and take some damage, and anima fragments will slow down briefly. Cogscarabs no longer actually DIE to emps, but are still stunned by them.

Basically, I want you to throw EMP grenades at the machine cult, because that seems like a thing you should be able to do, right?
2016-12-21 09:59:07 +13:00
coiax
1c93626573 \his 2016-12-20 19:38:08 +00:00
Jack Edge
e3c21f80af Library now has blood and brass (digitally)
Emagging the book management console and printing forbidden lore now has
a chance of producing a clockwork slab.

Reasoning: because sometimes it's fun to cultscare security with your
universal emag.
2016-12-20 19:18:47 +00:00
Joan Lung
b480a8bada Merge pull request #22314 from Shadowlight213/clothes
Adds 2 performers outfits.
2016-12-20 13:33:02 -05:00
Cheridan
54b994718a Merge pull request #22328 from ExcessiveUseOfCobblestone/patch-9
Hydroponic Trays can now be Renamed
2016-12-20 10:34:10 -06:00
Joan Lung
e83c720e8c say_log now has timestamps 2016-12-20 11:01:30 -05:00
Leo
a8e280c2e2 Only traitors/ops can hijack now 2016-12-20 13:16:39 -02:00
coiax
88287e90db Fixes a grammar mistake in the golem info message (#22319)
Reasoning: grammar mistakes are bad.
2016-12-20 08:43:40 -05:00
Cheridan
6535759999 Merge pull request #22304 from XDTM/Abfixors
Fixes a couple of abductor bugs
2016-12-19 20:00:02 -06:00