Commit Graph

32146 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
oranges
58e21ba5a8 Merge pull request #22433 from lzimann/lzimann-patch-1
Fix lollipop dispenser message
2016-12-26 14:39:49 +13: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
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
Leo
80852b70f6 Fix lollipop dispenser message 2016-12-24 12:15:41 -02: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
oranges
2454156ff0 Merge pull request #22353 from ChangelingRain/saylogged
say_log now has timestamps
2016-12-23 09:34:33 +13:00
Firecage
1a23d1ecd6 Makes Grille code a bit more sensible and simpler (#22352)
* Modularizes some grille stuff.

* rverts istype() of attack_by
2016-12-23 09:34:15 +13:00
Cyberboss
b1e4a9a2dd Fixes bombs breaking (#22349)
* REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE

* FAIR FUCKING WARNING

* OOP

* Prolly better off here

* Less superfluous warning

* More passive aggressive

* "Strike that! Reverse it."

* DRY destruction
2016-12-23 09:34:00 +13:00
bgobandit
666f28aa49 Adds lumps of coal. (#22346) 2016-12-23 09:33:22 +13:00
ExcessiveUseOfCobblestone
2122091f79 Quantum Pads can now be Renamed (#22326)
🆑 Cobby
:tweak: Allows Quantum Pads to be renamed. Trust these as much as you trust the "try jumping" messages on Dark Souls.
/🆑

This allows for quick [re]labeling of Quantum pads and was the purpose of setting `unique_rename` to /obj/ anyways.

As alluded to in the CL, feel free to use this maliciously as antag ;-)
2016-12-23 09:32:59 +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
PKPenguin321
275234cb5a Readds opening doors with corpses (but not with drones/borgs) (#22397)
* readds emergent gameplay

* switches order, uses helpers, restricts borgs

* also fixes windoors

* whoops
2016-12-23 09:28:56 +13:00
F-OS
b707c1f47a Swarmers can no longer breach the station. (#22330)
* please work.

* fixed it for kor. hope this works.

* this should fix it
2016-12-23 09:27:22 +13:00
Joan Lung
db4dd34008 Merge pull request #22389 from MrStonedOne/patch-273
Removes that stupid fucking sound from pais
2016-12-22 12:33:55 -05:00
militaires
edc58d99ac aaaaaaaaaaaaaa haaaaaaaaasaaaaaaaaaaaayaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2016-12-22 16:52:34 +03:00
oranges
6eab8df572 Byond stacktraces (#22361)
Byond help
2016-12-22 13:40:52 +01:00
Cyberboss
9208b75ac7 Adds missing proximity inheritance to ChangeTurf (#22363) 2016-12-22 13:18:56 +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