c1368f6816
Fixes what Miauw said with the secbelt thing.
2015-01-11 21:31:21 +02:00
2e20b8ea91
Biogenerator stuff.
2015-01-11 16:53:41 +02:00
404cd883f7
Merge pull request #6705 from Steelpoint/EmergencyResponseTeam
...
[FEATURE] Emergency Response Team
2015-01-10 10:10:59 +01:00
8b32186300
Merge pull request #6903 from paprka/varpleasego
...
Removes an unused var
2015-01-10 01:01:43 -03: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
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
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
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
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
d79c6fe929
Merge pull request #6617 from Firecage/Statue_Fixes
...
Statue fixes
2015-01-04 13:53:45 +01:00
aab9f7e450
NTSymbolForERTOfficers
2015-01-04 18:32:26 +08:00
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
3a10a3b198
Merge pull request #6427 from paprka/janitorbuffholyfuckvalvepleasenerf
...
Adds dirt overlays for walking on simulated turfs
2015-01-04 02:22:50 +00:00
a3f5e7ebfd
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
...
Conflicts:
code/game/gamemodes/setupgame.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Machinery.dm
2015-01-04 01:52:14 +00:00
8527f23d85
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby
2015-01-03 17:05:27 -08:00
50a7f76f18
derp'd with the names
2015-01-04 00:36:04 +00:00
fb4e1c56c2
Update RCD.dm
2015-01-04 00:32:37 +00:00
585971270a
moved and renamed variable
2015-01-03 23:49:03 +00:00
c227ebefe8
Updated base object and fixed missing line.
2015-01-03 23:48:21 +00:00
69aea446a3
Fixes conflicts
...
Adds handling for canister teleportation shinanagans
Refactors nozzles slightly so they act properly if someone manages to swipe the tank without it ever touching the floor
2015-01-03 17:15:08 -05:00
18e4cec460
Adds a new body outline graffiti for crayons, gives the detective a white crayon, changes the sprite for the mime crayon, and puts a waistcoat in the detective's closet.
2015-01-03 13:44:23 -06:00
19ad927d4f
Fixing desc to show max cap of the RCD
...
Was hard coded to show 30, moving it to a variable and actually making use of it.
2015-01-03 16:48:43 +00:00
6d6547467a
Fixes simple animals not being able to unbuckle themselves.
...
Fixes pet slime. There's no longer two types of adult pet slimes, simplifying adult pet slime's Die() proc.
Fixing some absolute path in slime/slime.dm
2015-01-03 14:35:14 +01:00
bf5bddf0c7
Merge branch 'master' of https://github.com/tgstation/-tg-station into Socks
...
Conflicts:
config/admins.txt
2015-01-03 07:07:03 -06:00
1153ef4700
Merge pull request #6651 from paprka/tablesandwindowsbaby
...
Fixes shuttle windows smoothing with normal windows
2015-01-03 00:22:29 +01:00
Firecage