Commit Graph

4458 Commits

Author SHA1 Message Date
Iamgoofball f527d53e3e Increases the cigarette chemical cap as per request by @Miauw62 2015-01-12 19:01:52 -08:00
Menshin 435ccf7ff9 * OOP'ed ear damages/deafness status updating
* Silicons are now immuned to ear damages/deafness
* Only living mobs can now take ear damages/be deafened
* Simple animals are now healing ear damages/deafness at the same rate as other living mobs
* Fixes being able to hear AI announcements when deaf
2015-01-13 00:40:46 +01:00
tkdrg 379b7b83fc Fixes a missed variable 2015-01-11 20:00:41 -03:00
tkdrg b852aa41ea Replaces a bunch of input() with stripped_input()
Some of these were exploitable for XSS, as well.
2015-01-11 19:02:53 -03:00
Firecage c1368f6816 Fixes what Miauw said with the secbelt thing. 2015-01-11 21:31:21 +02:00
tkdrg 1218610f75 Merge pull request #6847 from Razharas/GenFixes
Fixes bugs caused by datum mutations
2015-01-11 16:14:03 -03:00
Iamgoofball 493dd27679 Merge branch 'master' of https://github.com/tgstation/-tg-station into byond
Conflicts:
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/reagents/reagent_containers/glass/bottle.dm
2015-01-11 09:53:49 -08:00
Firecage 2e20b8ea91 Biogenerator stuff. 2015-01-11 16:53:41 +02:00
Swag McYolosteinen cd3e08f624 Merge pull request #6942 from lolnon/transfer_valve_kek
Fixes some functional but kekworthy code in transfer_valve.dm
2015-01-11 12:22:32 +01:00
Steelpoint 982c54c2f3 EmergencyResponseTeamV2 2015-01-11 19:21:38 +08:00
Iamgoofball b70fde1ed2 Fixes and Tweaks, adds mutations_say_mods() and say_mod() for mutations 2015-01-10 23:42:31 -08:00
Iamgoofball 39ede45b31 Added 2 new powers and 9 new disabilities! 2015-01-10 21:51:24 -08:00
Razharas a6ae15215a Merge branch 'master' of https://github.com/tgstation/-tg-station into GenFixes 2015-01-11 08:48:03 +03:00
tkdrg 0f19537c2d Merge pull request #6721 from phil235/CargoCrateNameFix
Many typo fixes
2015-01-10 20:11:13 -03:00
tkdrg b0635993a4 Revert "[FEATURE] Emergency Response Team" 2015-01-10 19:55:30 -03:00
Sawu 7097887851 Americanised the Manual
Changes spelling to the appropriate (American) locale.
2015-01-10 23:28:41 +11:00
Swag McYolosteinen 404cd883f7 Merge pull request #6705 from Steelpoint/EmergencyResponseTeam
[FEATURE] Emergency Response Team
2015-01-10 10:10:59 +01:00
lolnon fd6dc4f9f9 Fixes some functional but kekworthy code in transfer_valve.dm 2015-01-10 09:01:59 +00:00
Sawu 39bcc16206 Experimentor updates
* Fixes a formatting error in the manual
* Fixed Item layering used by experimentor
* Added "crtical" results for certain R&D items
* Changed the detection for Ian/Runtime
2015-01-10 16:31:05 +11:00
Cheridan 0956a86c22 Firing Pin System - The Lockbox Solution 2015-01-09 18:49:02 -06:00
Sawu c4bd4bc36b Fixes a mis-spelling
* Clears all hypocrisy
2015-01-10 07:24:38 +11:00
Sawu 6b361b077f Experimentor updates
* Adds "Global" fails that can occur on any EXPERI-MENTOR process.
* Replaces telesci with the Experimental Lab
* Fixes numerous Experimentor bugs (item layers, part exchanger etc)
* Adds an in-game manual to the Experimental lab to teach players to use the machine.
2015-01-10 07:16:58 +11:00
tkdrg 40e5476a53 Merge pull request #6598 from Incoming5643/InstantSummons
Magic Mania 1.81: Instant summons!
2015-01-09 03:29:15 -03:00
Steelpoint 34589f52bf Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
	icons/obj/gun.dmi
2015-01-09 11:02:50 +08:00
tkdrg 69280f6b9b Merge pull request #6879 from dannno/bandolier
Adds shotgun bandoliers
2015-01-08 22:47:09 -03:00
hornygranny 56bad0f7ce Merge pull request #6747 from paprka/gunchangesv2baby
Further changes to the ranged stun system
2015-01-08 16:09:37 -08:00
Razharas f48563f1d1 Fixes some bugs and rutimes tkdrg pointed
Monkeys arent blind anymore
Bad dna mutation runtime fixed
Two handed shit runtime fixed
Carbons unarmed attacks runtime fixed
2015-01-08 22:35:07 +03:00
tkdrg 567755d798 Merge pull request #6836 from Boggart/holosignfix
Fixes the holosign projector making signs when put into storage. (can_be_placed_into refactor)
2015-01-08 16:04:49 -03:00
dannno cdc01c68df remove unnecessary shiet 2015-01-07 23:23:34 -05:00
dannno c76072608a bamboliers 2015-01-07 20:28:16 -05:00
Boggart e0a968f151 Fixes the holosign projector making signs when put into storage, generalizes can_be_placed_into and improves the check in objects that use it. 2015-01-07 01:09:58 -07:00
tkdrg 778eb28c15 Repaths practice laser
It's now /obj/item/projectile/beam/practice to inherit laser stuff.
2015-01-07 04:45:49 -03:00
Steelpoint 5f77b95b23 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 2015-01-07 01:38:38 +08:00
Razharas 8a14a49041 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenFixes 2015-01-06 15:41:38 +03:00
Razharas fddb333a7a General fixes of bugs caused by mutations
Fixes visibility in crit
Fixed xray and nightvision not working
Fixed dna changing diseases
Fixed hulks doing damage on all intents
Fixed transform procs sometimes breaking dna forever
2015-01-06 15:38:40 +03:00
Remie Richards 005d79073a Merge pull request #6731 from tkdrg/ntrc_strikes_back
Adds an "unread message count" to the NTRC link
2015-01-06 07:22:45 +00:00
Remie Richards b798df68ab Merge pull request #6790 from tkdrg/ExhaustedPlumpCamel
Fixes a few RPD painting bugs
2015-01-06 07:20:28 +00:00
tkdrg 931f75b7e8 Merge pull request #6779 from TZK13/Crayon-Body-Outlines
Adds a new body outline graffiti for crayons and gives the detective a white crayon
2015-01-06 04:18:21 -03:00
Steelpoint ec821c33d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
Conflicts:
	_maps/map_files/generic/z2.dmm
	code/_globalvars/lists/mapping.dm
2015-01-06 12:17:29 +08:00
paprka f0712db606 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby
Conflicts:
	code/modules/projectiles/guns/energy/stun.dm
2015-01-05 18:43:46 -08:00
Xhuis 8f42d43b04 Merge remote-tracking branch 'remotes/upstream/master' into knife_fix 2015-01-05 21:35:05 -05:00
Xhuis a5c9a7292f Makes butcher's cleaver a child of kitchen knife 2015-01-05 17:23:03 -05:00
phil235 9355baf97c Merge branch 'master' of https://github.com/tgstation/-tg-station into CargoCrateNameFix
Conflicts:
	code/controllers/supply_shuttle.dm
	code/game/objects/items/weapons/RCD.dm
2015-01-05 22:07:08 +01:00
carnie 281df385a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 2015-01-05 19:52:03 +00:00
tkdrg 4e84fb2eef Changes a missed del() to qdel() 2015-01-04 16:22:27 -03:00
Xhuis e7a9a0bdfc Makes the butcher cleaver a normal-sized item 2015-01-04 14:21:27 -05:00
phil235 6c156f5218 Merge pull request #6774 from psykzz/patch-2
Fixing desc to show max cap of the RCD
2015-01-04 15:04:45 +01:00
Steelpoint aab9f7e450 NTSymbolForERTOfficers 2015-01-04 18:32:26 +08:00
tkdrg 2eb366de89 Fixes a few RPD painting bugs
Changes RPD colors to be consistent with pipe painter & default pipes.
Makes the RPD properly update its neighbors on painting.
Offloads the neighbor updating logic from pipe_painter to a pipe proc.
Fixes #6783
2015-01-04 04:35:36 -03:00
Remie Richards 3a10a3b198 Merge pull request #6427 from paprka/janitorbuffholyfuckvalvepleasenerf
Adds dirt overlays for walking on simulated turfs
2015-01-04 02:22:50 +00:00