eea9ae50ad
merging
2014-07-29 16:50:21 -07:00
d992c907c6
goodbye rigsuits my old friends
2014-07-29 11:43:34 -07:00
fdadd6ad86
Fixes Permanent Airlock welding, adds sound to dismantling a locker
2014-07-16 00:45:38 +01:00
d34f9fd02e
Merge pull request #3946 from RemieRichards/16/06/2014-AirlockWelding
...
Airlocks and Lockers take time to weld and unweld
2014-07-01 23:22:51 -05:00
96354bb56d
Lockers now take 40 ticks to weld + Sounds + Feedback messages
...
Minor reformat of code for Locker welding
2014-06-19 16:13:10 +01:00
a8b7588c12
Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp
...
Conflicts:
code/game/objects/items/weapons/grenades/ghettobomb.dm
code/game/objects/structures/door_assembly.dm
2014-06-19 02:27:10 +04:00
df285ff7b3
Resolved conflicts:
...
code/modules/mob/mob.dm
2014-06-13 09:04:30 -06:00
9c6ac5c5f7
Merge pull request #3818 from phil235/ChameleonMimeFix
...
FIx issue #3692
2014-06-12 10:34:41 +01:00
3908160998
One big update for stacks.
2014-06-10 20:36:08 +04:00
b1f050e63a
Adding fingerprints to actions:
...
-breaking windoors
-wrenching/unwrenching pipe dispensers
-locking/unlocking crates
-breaking grilles
-smashing windows
-deconning walls
2014-06-04 22:30:46 -06:00
2ebf4f57e5
under/det into under/rank/det
2014-05-31 00:38:53 +02:00
82b861702f
Resolved Conflicts:
...
code/modules/mob/living/simple_animal/constructs.dm
2014-05-25 10:59:08 -06:00
36bb032957
Merge pull request #3509 from Cheridan/MeteorsSuck
...
Meteor Stuff
2014-05-17 18:42:16 -05:00
8c1e1e1423
Resolved stupid map conflicts
2014-05-15 09:12:47 -06:00
3a0bd3de28
Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck
...
Conflicts:
code/game/turfs/simulated/walls.dm
2014-05-13 14:03:42 -05:00
e13ab9422d
Merge pull request #3610 from Aranclanos/washingmachine
...
Washing machine fixes
2014-05-13 16:55:26 +01:00
61b156a07f
Added attack cooldowns to a few objects
...
Includes:
-Fire axe cabinets
-Captain's display case
-RD's lab cage
2014-05-10 12:10:41 -06:00
fd4a0c86eb
-Added an auxiliary storage compartment in SSUs to store one item
...
-Moved CE's magboots and captain's jetpack into them
-Updated it so that any mob can be placed inside the SSU now. Including Corgis.
2014-05-08 22:53:10 -06:00
b215db8b76
Suit Storage Units
...
-Added them around the station, replacing the ones that were just on racks (e.g. Engineering hardsuits, Captain's, etc)
-Removed their object verb. You can now just click drag yourself to climb in
-They now use the new fancy window colors
-Updated Minisat Maint a little bit to give the wall a bit more width around the SMES units. Shouldn't be so much of a vulnerability any more
2014-05-06 22:18:30 -06:00
9ae36480b2
Merge pull request #3618 from kyrahabattoir/ItemNameFixingRound4
...
More name fixing, lowercasing objects, proper-ing unique objects, plural...
2014-05-05 11:46:35 -05:00
997e1310c5
More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it.
2014-05-01 23:07:35 +02:00
b544a945a9
Fixes issue #2489
...
Fixes issue #119
Transferred all the different colours of under clothes and shoes to obj/item/clothing/under/colour/XXX and obj/item/clothing/shoes/sneakers/XXX
Added two extra options to the spawn menu of the game panel, clothing and food.
2014-05-01 06:01:14 -03:00
4d8160ab14
meteorhit() is kill
2014-04-22 12:16:02 -05:00
80e7d1d0e7
Added a check for "_nodrop_" items for several machines/structures ( fix #3407 ).
2014-04-20 20:49:32 +02:00
b800d97e3c
Changed execution chamber access to access_hos, removed bolt controls
2014-04-13 13:51:30 -06:00
b18cc7d54e
Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat
...
Conflicts:
code/game/machinery/doors/airlock.dm
code/game/objects/structures/door_assembly.dm
code/game/objects/structures/false_walls.dm
code/game/objects/structures/mineral_doors.dm
code/modules/research/protolathe.dm
icons/obj/doors/door_assembly.dmi
2014-04-11 02:51:07 +10:00
35950b90fd
SecMapChangeV3
2014-04-09 19:17:11 +08:00
f6906addb2
Merge pull request #3285 from Steelpoint/JaniBelt
...
Adds the janibelt!
2014-04-04 08:10:21 -05:00
4dc2ccce1f
Merge pull request #3266 from phil235/FireAxeCabineFix
...
Fireaxe cabinet hacking now fails if player moves away
2014-04-02 21:26:37 -05:00
fc0f56a8c6
Merge pull request #3274 from Aranclanos/DermalPatch
...
Added back the dermal patch to the HoS locker.
2014-04-02 19:46:12 +02:00
f45391a838
JaniBelt implementation
2014-04-03 01:30:02 +08:00
449c3655da
Added back the dermal patch to the HoS locker.
...
For some reason this item keeps getting stealth changes lately.
2014-04-02 04:50:16 -03:00
d58ee721dc
Changing user messages to use span class stuff.
2014-04-01 23:06:51 +02:00
06dcf22a49
Fireaxe cabinet hacking now fails if player moves away
...
Removes the ability to run away right after initializing the cabinet hacking with a multitool and still successfully finish the hacking(and seeing the hack message).
Also, playing the relocking sound at the beginning of the hacking instead of the end for consistency with the unlocking hack.
2014-04-01 22:04:08 +02:00
79746e115f
Wooden Walls
2014-04-01 18:03:02 +11:00
2de4ffeb31
Committing what I have for now just in case. Also includes the new shuttle door type and added an airlock painter to the CE's closet.
2014-03-29 22:32:35 -06:00
7bcb69ad88
Removes the click cooldown from almost everything, now it should be always be 0.1 seconds.
...
Ranged weapons and laser eyes have a cooldown of 0.4.
Grilles, windows, windoors, walls and blobs have a cooldown of 0.8.
Hitting mobs will also have a cooldown of 0.8.
Removes the unused USEDELAY flag.
2014-03-28 06:32:47 -03:00
3187be3e51
Merge pull request #3111 from Ikarrus/seclocks
...
[MAP] Security Lockers Organization
2014-03-25 11:00:48 -05:00
6b83a8d2e0
I am crying.
...
Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue
Conflicts:
code/game/objects/structures/crates_lockers/closets/statue.dm
code/modules/mob/living/simple_animal/hostile/statue.dm
code/modules/projectiles/projectile/magic.dm
tgstation.dme
2014-03-24 22:13:43 -04:00
8af8a43d6f
Initial pass to convert LF to CRLF
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-03-24 08:53:40 +00:00
bab77f2538
Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue
...
Conflicts:
code/modules/projectiles/projectile/magic.dm
2014-03-23 12:08:33 -04:00
64c2138aa5
Merge pull request #3108 from TZK13/Bluebay-2-Electric-Bloogaloo
...
[MAP] Bluebay 2: Electric Bloogaloo
2014-03-22 20:01:55 -03:00
6930283efc
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
...
Conflicts:
code/game/gamemodes/changeling/changeling_mutations.dm
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/malfunction/Malf_Modules.dm
code/game/objects/items/weapons/tanks/watertank.dm
code/game/objects/structures/tables_racks.dm
code/modules/research/server.dm
2014-03-21 03:05:39 -07:00
ad8a374e06
[MAP] Security Lockers Organization
...
-Moved spare HoS uniforms and backpacks into a separate wardrobe closet. This is mostly to reduce the content size of the HoS locker, making it easier to use.
-Moved sec backpacks into the security wardrobe closets.
-Moved Captain's formals down in the stack order so it doesn't get in the way of the items that are used more often. Alt uniforms should be stored on the bottom of the pile.
-Removed stealth change giving the Captain the super-robust dermal armor
2014-03-17 23:55:08 -06:00
e689130c03
Makes Greenbay into Bluebay, take two.
2014-03-17 22:25:57 -05:00
c3eef7846b
-Added Nienhaus's new HoP uniform and cap. Old sprites are renamed to hop_old
...
-Removed HoP's spawning armor and moved the one in the locker higher up in order
-Glory to Nanotrasen
2014-03-12 22:32:49 -06:00
6147bf6053
Returned armor vest to the HoP's locker
2014-03-12 10:25:29 -06:00
fba4280ec2
Removes HoP's armor and helmet
2014-03-12 08:47:01 -06:00
b6e7155a24
Changed janitor and atmos tanks slightly
2014-03-10 20:27:21 +00:00
8423e6765c
Merge pull request #3002 from Aranclanos/GrabOnLockers
...
Grabs won't runtime anymore on lockers
2014-03-09 16:10:20 -05:00
paprka
Robson Richards
Cheridan
Kelenius
ikarrus
Alex
phil235
fleure
Kyrah Abattoir
Aranclanos
Menshin
Jordie0608
Steelpoint
Rockdtben
Miauw62
Incoming
Mloc-Hibernia
MrPerson
TZK13