8f98597490
Merge pull request #7049 from RemieRichards/PipesAndBuckles
...
Buckling Refactor + HE Pipe heat based colour
2015-01-20 20:07:18 -06:00
e979bc95b1
Merge pull request #7150 from paprka/shoulderholster
...
Adds shoulder holster for the detective
2015-01-20 17:59:25 +01:00
ad04ce62a0
AllAccess+EasierSuitIdentification
2015-01-20 20:53:13 +08:00
bff20264da
Fixes ppgrass ausbush having wrong icon_state
2015-01-18 17:25:14 -03:00
950bc17c23
Gives the monkey dexterity message to some stuff.
2015-01-18 11:48:53 +02:00
b5ecc03b07
improves the sprites and code a bit
2015-01-18 00:26:36 -08:00
f797b04e15
adds shoulder holster for the detective
2015-01-17 17:11:38 -08:00
ae21c54774
rip reindeer horns
2015-01-17 15:43:39 -08:00
b83e6d9da4
winter coat removals
2015-01-17 15:39:50 -08:00
8a61d11e2e
Merge pull request #7069 from Firecage/table_deconstruction_fix
...
Fixes amount of materials gotten from deconstructing tables
2015-01-17 19:57:49 +01:00
35cc6e3c54
Replaces pathing.
2015-01-16 18:21:01 -08:00
38070820f3
Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup
2015-01-16 17:25:50 -08:00
f3398e58a9
Removes Star Trek chemistry and transfers us to Goon Chemistry.
2015-01-16 17:21:36 -08:00
ac3c413f24
Merge pull request #6969 from Firecage/Biogenerator_stuff
...
Adds stuff to Biogenerator. STUFF!.
2015-01-16 17:31:25 -03:00
dc602f9d57
Indentation fix. How did that single space instead of the tab worl anyway...
2015-01-16 15:38:31 +02:00
018b7379b4
Merge pull request #7088 from Firecage/tele_window_knocking_delay
...
Simply adds a delay to knocking in windows with TK.
2015-01-16 13:59:39 +01:00
63e09d0928
Merge pull request #6966 from Steelpoint/ERTv2
...
[FEATURE] Emergency Response Team V2
2015-01-15 23:41:20 -06:00
7fdd0556bb
Updates to table/table frame deconstruction
2015-01-15 17:55:51 +02:00
f40d799e34
Simply adds a delay to knocking in windows with TK.
2015-01-15 11:49:38 +02:00
fac0168ecb
improves janicart and adds secway
2015-01-15 01:34:39 -08:00
62ddab926f
Fixes amount of mineral gotten from deconstructing tables
2015-01-15 03:31:56 +02:00
d6d02cb142
Merge branch 'master' of https://github.com/tgstation/-tg-station into eff3shit
2015-01-14 14:54:22 -06: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
82bff079c7
Merge pull request #6137 from Iamgoofball/byond
...
Goon Chemistry [FINISHED]
2015-01-14 02:31:56 -03: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
d10364797a
Merge pull request #6981 from dannno/bandanno's
...
Bandanas/More jumpsuits in mixed fixed
2015-01-13 21:49:47 -03:00
bd565e5138
eff 3 update/locker fix
...
updates efficiency 3
-adds araneus, renault, and wags-his-tail
-adds an extra sink to medbay
-lots of player-requested fixes
-gives the cmo a medical hardsuit
-fixes catwalk inconsistency
-cosmetic changes to the HOS' office
-bartender now has a closet full of outfits for potential employees
additionally, this makes a very small code change. white wardrobes now start with 3 white softcaps.
2015-01-13 15:15:14 -06:00
3dc5a04038
Merge branch 'master' of https://github.com/tgstation/-tg-station into bandanno's
...
Conflicts:
config/admins.txt
2015-01-12 15:55:51 -05: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
f8573ba257
u know what it is
2015-01-11 16:08:21 -05: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
91e5ec9b4e
Goon Chemistry Commit 3: Pyrotechnics and other changes
2015-01-11 08:49:09 -08:00
982c54c2f3
EmergencyResponseTeamV2
2015-01-11 19:21:38 +08:00
4d34f2235e
Fox 2.0
...
https://github.com/tgstation/-tg-station/pull/6489/
2015-01-09 16:41:37 -06: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
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
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
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
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
d79c6fe929
Merge pull request #6617 from Firecage/Statue_Fixes
...
Statue fixes
2015-01-04 13:53:45 +01:00
Cheridan
Swag McYolosteinen
Steelpoint
tkdrg
Firecage
paprka
phil235
Iamgoofball
pudl
Remie Richards
dannno
Nienhaus
paprka
phil235
carnie
Ergovisavi