5f46ebe2b9
Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned
2015-01-15 16:14:27 -06:00
8d1ebf3ad1
* Prevent stacking of dense disposal constructs (bin, outlet, chute)
...
* Some general code cleaning (less snowflaking)
2015-01-15 20:05:15 +01:00
31ebd43b18
Fixes issues with the chronosuit and TED.
...
Removes unneeded vars from TED.
Re-adjusts armor values for chronosuit
2015-01-15 13:32:21 -05:00
f34afaa3c9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS
...
Conflicts:
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/obj/projectiles.dmi
2015-01-15 02:30:31 -05:00
4c8f890f88
Adds Timeline Eradication Device
2015-01-15 02:18:04 -05:00
17654037db
Ports Mloc's Refactor of buckling, All /obj can now buckle things. HE Pipes now change colour based on heat.
2015-01-14 19:07:18 +00:00
0de72483bc
Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-14 18:35:29 +11:00
82bff079c7
Merge pull request #6137 from Iamgoofball/byond
...
Goon Chemistry [FINISHED]
2015-01-14 02:31:56 -03:00
8bde2dea03
crossbow, speargun, and grenade updates
2015-01-13 20:00:58 -08:00
3f88acb6f6
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
...
Conflicts:
icons/mob/head.dmi
2015-01-14 11:25:07 +08:00
430b613ef4
Merge pull request #6984 from tkdrg/sanitaiz
...
Replaces a bunch of input() with stripped_input()
2015-01-13 19:32:25 +01:00
1a0cc48566
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
...
Conflicts:
icons/obj/gun.dmi
2015-01-13 15:32:28 +08:00
4bd70b2908
Merge pull request #6986 from Menshin/ear_damage_ooping
...
Ear damage/deafness tidying
2015-01-13 01:19:56 -06:00
64ba51c0b2
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
2015-01-13 12:52:24 +08:00
5a91ce4fee
Requested changes by @Cheridan
2015-01-12 20:38:56 -08:00
f8e1fac30c
Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned
2015-01-12 21:29:00 -06:00
03e1d0d60a
-Adds firing pin box define
...
-Examining a gun now shows its pin
-You can now emag a firing pin to make it function without checks.
-Loyalty pins unable to be constructed
2015-01-12 21:21:34 -06:00
f527d53e3e
Increases the cigarette chemical cap as per request by @Miauw62
2015-01-12 19:01:52 -08:00
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
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
c1368f6816
Fixes what Miauw said with the secbelt thing.
2015-01-11 21:31:21 +02:00
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
2e20b8ea91
Biogenerator stuff.
2015-01-11 16:53:41 +02:00
982c54c2f3
EmergencyResponseTeamV2
2015-01-11 19:21:38 +08:00
b70fde1ed2
Fixes and Tweaks, adds mutations_say_mods() and say_mod() for mutations
2015-01-10 23:42:31 -08:00
39ede45b31
Added 2 new powers and 9 new disabilities!
2015-01-10 21:51:24 -08:00
a6ae15215a
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenFixes
2015-01-11 08:48:03 +03:00
b0635993a4
Revert "[FEATURE] Emergency Response Team"
2015-01-10 19:55:30 -03:00
7097887851
Americanised the Manual
...
Changes spelling to the appropriate (American) locale.
2015-01-10 23:28:41 +11:00
404cd883f7
Merge pull request #6705 from Steelpoint/EmergencyResponseTeam
...
[FEATURE] Emergency Response Team
2015-01-10 10:10:59 +01:00
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
0956a86c22
Firing Pin System - The Lockbox Solution
2015-01-09 18:49:02 -06:00
c4bd4bc36b
Fixes a mis-spelling
...
* Clears all hypocrisy
2015-01-10 07:24:38 +11:00
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
40e5476a53
Merge pull request #6598 from Incoming5643/InstantSummons
...
Magic Mania 1.81: Instant summons!
2015-01-09 03:29:15 -03:00
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
69280f6b9b
Merge pull request #6879 from dannno/bandolier
...
Adds shotgun bandoliers
2015-01-08 22:47:09 -03:00
56bad0f7ce
Merge pull request #6747 from paprka/gunchangesv2baby
...
Further changes to the ranged stun system
2015-01-08 16:09:37 -08:00
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
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
cdc01c68df
remove unnecessary shiet
2015-01-07 23:23:34 -05:00
c76072608a
bamboliers
2015-01-07 20:28:16 -05:00
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
5f77b95b23
Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
2015-01-07 01:38:38 +08:00
8a14a49041
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenFixes
2015-01-06 15:41:38 +03:00
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
b798df68ab
Merge pull request #6790 from tkdrg/ExhaustedPlumpCamel
...
Fixes a few RPD painting bugs
2015-01-06 07:20:28 +00:00
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
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
8f42d43b04
Merge remote-tracking branch 'remotes/upstream/master' into knife_fix
2015-01-05 21:35:05 -05:00
Cheridan
Menshin
JJRcop
Remie Richards
Sawu
tkdrg
paprka
Steelpoint
Swag McYolosteinen
Cheridan
Iamgoofball
Firecage
Razharas
hornygranny
dannno
Boggart
Xhuis