Commit Graph

1094 Commits

Author SHA1 Message Date
Cheridan
283cd657fe Merge pull request #5955 from Jordie0608/ideletedmyvdibyaccident
Fixes #5951 Uplink implant TC amount description
2014-11-20 08:55:15 -06:00
Jordie
48b60c82a1 Corrects uplink implant desc tc amount 2014-11-19 19:46:06 +11:00
Cheridan
1208c48af3 Merge pull request #5652 from Menshin/atmos_z_level_fix
Atmos z level fix + radio controller code sanitization
2014-11-18 17:05:14 -06:00
Razharas
e205c8f2f6 Merge pull request #5857 from paprka/lolnames
Fixes a bunch of capitalization inconsistencies, adds names to vendors
2014-11-18 03:46:26 +03:00
Remie Richards
82d1af3ed9 Merge pull request #5888 from Menshin/supply_comp_href_fix
Cargo shuttle href exploit fixed + orderable syndi crates
2014-11-17 09:43:02 +00:00
paprka
f69f81c8c2 fixes fuel tank crate 2014-11-16 12:34:11 -08:00
Cheridan
8202db4227 Merge pull request #5755 from Miauw62/bughl
Fixes grinders opening their menus on range.
2014-11-14 14:50:46 -06:00
hornygranny
5b46822171 Merge pull request #5876 from phil235/ContagiousAppendicitisFix
Fixes appendicitis being contagious.
2014-11-14 10:54:10 -08:00
Remie Richards
935775bfc1 Merge pull request #5788 from Miauw62/runtime2
Fixes some AI traitorize runtimes.
2014-11-14 18:12:50 +00:00
Menshin
56cf16b3ab * Fixed supply comp/order comp href exploit (being able to order any supply pack, even if not hacked/contraband enabled).
* HTML tags are now properly stripped from inputted text
* Syndicates crates are now orderable.
2014-11-14 13:14:22 +01:00
Menshin
ec944abfc6 * limit atmos/fire alerts to the current z_level
* atmos/fire alerts are now linked to an object and not its area, as intended
* simplified and full pathed the radio frequency datum
* made radio objects properly clean on del/qdel, instead of letting the radio controller remove nulls at each post_signal()
2014-11-14 10:10:45 +01:00
paprka
aa2ecbec99 Fixes a missed capitalization issue 2014-11-13 18:20:57 -08:00
Cheridan
38eeca2ebd Merge pull request #5644 from Jordie0608/beekeepermodewhen
Adds bee swarms and butterflies and diseases to create them
2014-11-13 17:04:29 -06:00
phil235
d59e91fedc Fixes appendicitis being contagious. 2014-11-13 16:33:37 +01:00
paprka
fe94f9cab0 Fixes a bunch of capitalization inconsistencies, adds names to vendors 2014-11-12 15:37:21 -08:00
phil235
1e6f4cde1f Fixes spread_flags values 2014-11-12 16:38:57 +01:00
Miauw
f491d9dfe1 Fixes some AI traitorize runtimes. Fixed #4605 2014-11-09 14:51:26 +01:00
Miauw
ef78be0595 Fixes grinders opening their menus on range. Fixed #4088 2014-11-08 15:28:32 +01:00
Jordie0608
590684e129 Merge branch 'master' of https://github.com/tgstation/-tg-station into beekeepermodewhen
Conflicts:
	icons/mob/animal.dmi
	tgstation.dme
2014-11-09 00:15:12 +11:00
Cheridan
cf3525aa46 Merge pull request #5693 from Aranclanos/LINDAISAGODESS
Roundstart turfs next to space deactivated (LINDA) fix
2014-11-08 00:48:23 -06:00
Remie Richards
3731747d11 Remembers to remove code/datums/disease.dm , code/datums/disease/_disease.dm replace it. 2014-11-08 06:12:22 +00:00
Remie Richards
2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
2014-11-08 01:07:29 +00:00
Aranclanos
21f00b98c6 Fixes LINDA not properly activating turfs who are next to unsimulated turfs with differences (space turfs are unsimulated)
Fixes turfs losing air too slow next to space turfs when the adjacent turfs number is low.
2014-11-05 14:54:29 -03:00
hornygranny
b8f0ef4efe Merge pull request #5541 from xxalpha/cigarettes
New Cigarette Packs
2014-11-03 18:49:29 -08:00
hornygranny
d81eb696c4 Merge pull request #5570 from xxalpha/noslipfloor
High-traction Floor
2014-11-03 17:37:20 -08:00
hornygranny
bf9679d6cb Merge pull request #5581 from tkdrg/spacefactory13
Constructable conveyor belts!
2014-11-03 17:33:32 -08:00
hornygranny
7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
Jordie0608
abc71566e8 Corrects path error 2014-11-04 03:59:24 +11:00
Jordie0608
2ef1fd21d6 Adds bee swarms and butterflies and diseases to create them 2014-11-04 03:52:18 +11:00
Cheridan
3239c6dbfc Merge pull request #5283 from TZK13/Syndicate-Encryption-Key
Adds a Syndicate encryption key to uplinks
2014-11-03 10:02:28 -06:00
tkdrg
a5aa93a280 Constructable conveyor belts can now be ordered from cargo. 2014-10-31 18:28:25 -03:00
xxalpha
b9f5947f5e High-traction Floor 2014-10-31 01:50:31 +00:00
Remie Richards
fa184f5487 Cuts /disease variables from 28 to 23 (includes new ones)
a disease may now have more than one spread type
added "infectivity" variable which replaces a prob(65), defaults to 65
affected_species is now viable_mobtypes, and lists typepaths, this is due to us actually having a species system now so it's confusing
adds defines for a bunch of stuff
2014-10-30 06:21:14 +00:00
xxalpha
7803f296ba New Cigarette Packs 2014-10-30 00:08:14 +00:00
paprka
b226919562 sprite missing pixel and supply packs mop replacement 2014-10-23 13:49:28 -07:00
paprka
b136cf653c wet floor signs and advanced janitor research 2014-10-23 13:43:42 -07:00
phil235
e1b2b9e22a Fixes Space retrovirus being incurable. 2014-10-22 22:23:26 +02:00
hornygranny
2ce3c1b635 Merge pull request #5397 from Jordie0608/nowweneedassistantsanctuaries
Adds assistant antag config to show server rev
2014-10-22 10:55:52 -07:00
hornygranny
2a7af35a53 Merge pull request #5380 from paprka/mapedits
Adds lipstick to box and jackboots to non-sec areas
2014-10-21 18:25:31 -07:00
Jordie
b1a1732b07 Adds assistant antag config to show server rev 2014-10-21 20:04:51 +11:00
hornygranny
20329a3bdb Merge pull request #5240 from paprka/assantag
Assistant antagonist config option
2014-10-20 20:19:08 -07:00
paprka
0623553baa moved lipstick to formalwear crate 2014-10-20 15:52:57 -07:00
TZK13
6838b7b1b2 Lowers the cost of binary and Syndicate encryption keys from 6 TC's to 5. 2014-10-20 01:42:31 -05:00
Cheridan
455b526cc1 Merge pull request #5318 from phil235/MsgFix2
More messages fixed
2014-10-19 21:39:06 -05:00
phil235
9b9481d65c Changes many span classes.
Replaces for(mob in oviewers) show_message()  with visible_message() when possible.

Fixes the absolute pathing in Ninja code.

Fixes facehugger attack messages being bold red for third party (only the first leap message will stay bold red for third party, for better visibility)

Standardizes vomiting message

Fixes mech occupant not receiving any attack messages when the mech is attacked.
2014-10-18 16:00:38 +02:00
Cheridan
6bccac9d10 Merge pull request #5141 from optimumtact/cargo_deathbags
A box of bodybags now included in medical supplies crate
2014-10-16 08:58:24 -05:00
TZK13
d17137dcfb Adds a Syndicate encryption key to uplinks. 2014-10-16 03:38:14 -05:00
paprka
c0425bc06e initial commit of assistant antag option 2014-10-13 17:21:02 -07:00
Miauw
b5aa6acdc1 Makes surplus crates show up in the round end report. Fixed #5031. 2014-10-11 14:20:22 +02:00
Remie Richards
b54ed5b4e5 Merge pull request #5137 from paprka/holosignoff
Adds holographic janitor signs
2014-10-10 17:41:41 +01:00