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
3f802d1ae4
Merge pull request #6917 from Nienhaus/FoxV2
...
Fox 2.0
2015-01-10 20:38:58 -03:00
0f19537c2d
Merge pull request #6721 from phil235/CargoCrateNameFix
...
Many typo fixes
2015-01-10 20:11:13 -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
fd6dc4f9f9
Fixes some functional but kekworthy code in transfer_valve.dm
2015-01-10 09:01:59 +00: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
8b32186300
Merge pull request #6903 from paprka/varpleasego
...
Removes an unused var
2015-01-10 01:01:43 -03:00
0956a86c22
Firing Pin System - The Lockbox Solution
2015-01-09 18:49:02 -06:00
4d34f2235e
Fox 2.0
...
https://github.com/tgstation/-tg-station/pull/6489/
2015-01-09 16:41:37 -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
071c02b583
removes an unused var
2015-01-08 16:58:33 -08: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
b0fe1d9818
Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-01-08 02:09:02 +08:00
88e124e88c
Revert "Adds Nien's HoS formal sprites so they dont look like a Prince suit."
2015-01-07 09:12:39 -08:00
699439cc31
Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-01-08 01:12:29 +08:00
2a71a8ee12
Merge branch 'master' of https://github.com/tgstation/-tg-station into newhosjumpsuit
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/modules/clothing/under/jobs/security.dm
code/modules/clothing/under/miscellaneous.dm
code/modules/clothing/under/ties.dm
icons/mob/head.dmi
icons/mob/uniform.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/uniforms.dmi
2015-01-07 14:59:24 +01: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
778eb28c15
Repaths practice laser
...
It's now /obj/item/projectile/beam/practice to inherit laser stuff.
2015-01-07 04:45:49 -03:00
5f77b95b23
Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
2015-01-07 01:38:38 +08:00
be6532b825
Fixing a few things in statue's attackby
2015-01-06 16:26:16 +01: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
234e5bd64c
Merge pull request #6811 from paprka/spessbuckle
...
Fixes chair/bed buckle message
2015-01-06 04:38:48 -03:00
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
b798df68ab
Merge pull request #6790 from tkdrg/ExhaustedPlumpCamel
...
Fixes a few RPD painting bugs
2015-01-06 07:20:28 +00:00
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
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
a5c9a7292f
Makes butcher's cleaver a child of kitchen knife
2015-01-05 17:23:03 -05:00
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
281df385a2
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
2015-01-05 19:52:03 +00:00
7a83165f2b
Merge pull request #6773 from phil235/ShadeBuckleFix
...
Fixes simple animals not being able to unbuckle themselves.
2015-01-05 10:45:13 -08:00
49ea9b0543
EmergencyResponseTeam-AntagSelectionForAdmins
2015-01-05 20:20:11 +08:00
39f27a07e2
fixes buckle message
2015-01-04 21:56:50 -08:00
4e84fb2eef
Changes a missed del() to qdel()
2015-01-04 16:22:27 -03:00
e7a9a0bdfc
Makes the butcher cleaver a normal-sized item
2015-01-04 14:21:27 -05:00
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
Iamgoofball
Razharas
tkdrg
Sawu
Swag McYolosteinen
lolnon
Cheridan
Nienhaus
Steelpoint
paprka
hornygranny
dannno
paprka
Boggart
phil235
Remie Richards
Xhuis
carnie
Ergovisavi
phil235