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
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
Remie Richards
be6c8c54d1
Reverts Antag selection happening before job selection
2014-10-09 22:57:19 +01:00
Francis Devine
46e951ba5d
Allow cargo to order bodybags in a crate
2014-10-09 16:02:00 +13:00
paprka
5457503c67
adds holographic janitor signs
2014-10-08 13:48:44 -07:00
Cheridan
f96b017149
Merge pull request #5097 from phil235/Msg1Fix
...
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
Cheridan
84934d7456
fixing conflicts manually
2014-10-06 19:40:20 -05:00
phil235
dd7a3b7fbc
Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix
...
Conflicts:
code/modules/admin/admin_verbs.dm
2014-10-05 13:48:11 +02:00
Cheridan
08be1b34eb
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
phil235
537280b4b9
Removing many instances of the no longer used second argument of message_admins() proc.
...
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
2014-10-05 01:29:30 +02:00
Cheridan
7e8e728d85
Merge pull request #4986 from Ikarrus/gangfixes
...
Gang Mode fixes and improvements
2014-09-29 10:33:17 -05:00
Cheridan
0f5fd59c0c
Merge pull request #4919 from Miauw62/tatorbalance
...
Rebalances traitor items.
2014-09-27 17:13:50 -05:00
ikarrus
131b5ee0ec
- Removes the useless has_been_rev var
...
- Reworded intercept report to discourage security from inadvertently causing a gang to win.
- Recaller use is logged
- Made the text explaining membership visibility more visible
2014-09-26 21:37:07 -06:00
ikarrus
65e38bdfbc
Gang Mode fixes and improvements
...
The first of many. Most caused by horrible merge-related accidents.
- Gang converts are no longer revolutionaries
- Revolution controls show up in the TP again
- Gang added to game_options.txt defaulting to 0
- Clarified some help text strings
2014-09-26 19:27:13 -06:00
Remie Richards
1fd6f72f8e
Merge pull request #4923 from Menshin/active_diseases_cleaning
...
active_diseases list cleans up on disease cure
2014-09-23 22:54:57 +01:00
Miauw
206480744a
brings emag back down to 6 tc
2014-09-23 20:05:12 +02:00
Cheridan
ff5ec967eb
Merge pull request #4917 from Jordie0608/plastiqueisoldfrechforplasticexplosives
...
Standardizes name and path of plastique/plastic explosive/c4 to C4
2014-09-23 09:02:43 -05:00
Aranclanos
95b9754f01
Merge pull request #4507 from RemieRichards/AntagBeforeJobs
...
Antag selection before Job selection
2014-09-23 08:13:39 -03:00
Miauw
be939d4bc1
Adds Syndicate surplus crates, containing 50 TC of random items.
2014-09-22 20:16:59 +02:00
Miauw
619b7beede
Syndie bundle adjustments. Made the emag one TC more expensive.
2014-09-22 18:37:27 +02:00
ikarrus
eabe1f4491
Resolved conflicts and addressed maintainer feedback.
2014-09-21 15:30:54 -06:00
Menshin
fbfc9c1cbb
Makes the global active_diseases list clean up when a disease is cured.
2014-09-21 21:07:45 +02:00
Miauw
899d967953
Doubles the amount of TC and the prices of uplink items.
...
Stealthy items have been slightly decreased in price.
Weapons have been slightly increased in price.
Nuke items remain mostly unchanged.
2014-09-21 15:56:24 +02:00
