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
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
3c70c50930
Adds briefcase with cash to uplink
2015-01-03 15:08:57 +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
ad5872e84f
fixes window junction update to use initial icon state
2015-01-02 15:14:36 -08:00
ac57c7007b
Merge pull request #6723 from Boggart/airlockconstructionfix
...
Fixes being unable to build doors over firelocks, blast doors and shutters.
2015-01-02 04:16:17 -03:00
46ee047404
further changes to the ranged stun system
2015-01-01 22:22:03 -08:00
38acdca156
Merge pull request #6713 from phil235/DicerollRuntimeFix
...
Fixes runtime linked to diceroll proc
2015-01-01 16:58:39 -03:00
221385f884
Merge branch 'master' of https://github.com/tgstation/-tg-station into byond
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2015-01-01 11:51:43 -08:00
6a0f1be7cd
Merge pull request #6584 from phil235/HoloSwordFix
...
Fixes being able to smash grille/newscaster/mirror/lights with holo esword
2015-01-01 16:39:16 -03:00
56a1d11162
Adds an "unread message count" to the NTRC link
...
Fixes #6720
2015-01-01 13:54:52 -03:00
17c81726ce
Merge pull request #6722 from tkdrg/holytitsmergethis
...
[HOLY TITS MERGE THIS] Fixes Hulk server crash bug and also a couple typos
2015-01-01 13:41:35 +01:00
eee11feacb
ERTCommander+RipleyMech+AdditionEquipment
2015-01-01 18:43:05 +08:00
087ab6b415
MinorSpriteFix+CentcomHeadset+GunWeightChange
2015-01-01 15:13:06 +08:00
8ce0055f14
Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
...
Conflicts:
icons/obj/gun.dmi
2015-01-01 13:35:29 +08:00
f72ced26fd
PulseRifleVarients+ArmouryRooms+FixesAndRefinements
2015-01-01 13:33:23 +08:00
ff17e083eb
Fixes being unable to build doors over firelocks, blast doors and shutters.
...
As a result, any door with the sub_door variable set to 1 can have an airlock built over it.
Also fixes using a fireaxe to open unpowered poddoors and adds myself to the admins.txt.
2014-12-31 20:47:17 -07:00
371b66a334
Merge pull request #6678 from paprka/nitrile
...
Adds nitrile gloves
2015-01-01 00:29:04 -03:00
908922f24c
Fixes Hulk crash bug and typos
2014-12-31 23:28:14 -03:00
a8f5626183
Fixes typos in crate names from the cargo shuttle.
...
Fixes "mproper" in area and mech names when renaming them.
Fixes typos in RCD description.
Fixes typo in shock message.
2015-01-01 03:04:18 +01:00
9a9f0bc058
Merge pull request #6691 from Menshin/clientless_peeking_runtime_fix
...
Fixes runtime with moving objects in/out of storage while clientless mobs peeking
2014-12-31 22:19:38 -03:00
d048dd87bd
Merge branch 'master' of https://github.com/tgstation/-tg-station into janitorbuffholyfuckvalvepleasenerf
2014-12-31 17:14:03 -08:00
b6e1547f0e
Final Statues
2015-01-01 01:43:28 +02:00
Remie Richards
tkdrg
Steelpoint
paprka
Xhuis
phil235
carnie
Ergovisavi
phil235
Matt Smith
Incoming
TZK13
fleure
iamgoofball
Swag McYolosteinen
Boggart
Firecage