Commit Graph

428 Commits

Author SHA1 Message Date
Razharas
79d255be20 Merge pull request #3203 from MrPerson/qdel_table
Make wrenching tables apart not drop the wrench
2014-03-29 06:24:23 -07:00
Aranclanos
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
MrPerson
481427a46f Make wrenching tables apart not drop the wrench 2014-03-26 20:34:08 -07:00
Aranclanos
211d1ec509 Merge pull request #3173 from MrPerson/cream_of_torium
Small rewrite of crematorium and morgue so they work right.
2014-03-26 03:35:55 -03:00
Cheridan
3187be3e51 Merge pull request #3111 from Ikarrus/seclocks
[MAP] Security Lockers Organization
2014-03-25 11:00:48 -05:00
MrPerson
52b24f3549 Merge branch 'master' of https://github.com/tgstation/-tg-station into cream_of_torium 2014-03-25 04:42:10 -07:00
Incoming
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
MrPerson
41042d5efd Small rewrite of crematorium and morgue so they work right.
Only issue is that the damn things don't GC. Also lots of duplicate code between the two, still some other shittiness, but this is much better. I really just wanted to fix the bug where after usage you can't use em again until the tray gets deleted rather than GC'd.
On the plus side, they don't constantly make and delete trays every time someone opens them.

Also, and this is important, I uncommented the crematorium usage logging. It didn't runtime in testing so it should be good to go.
2014-03-24 04:01:27 -07:00
Mloc-Hibernia
8af8a43d6f Initial pass to convert LF to CRLF
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-03-24 08:53:40 +00:00
Incoming
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
Aranclanos
64c2138aa5 Merge pull request #3108 from TZK13/Bluebay-2-Electric-Bloogaloo
[MAP] Bluebay 2: Electric Bloogaloo
2014-03-22 20:01:55 -03:00
TZK13
aa7ae999bd Fixes map and dmi conflicts as well as the obj suits dmi. 2014-03-22 02:33:36 -05:00
MrPerson
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
ikarrus
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
TZK13
e689130c03 Makes Greenbay into Bluebay, take two. 2014-03-17 22:25:57 -05:00
Aranclanos
5f42c17ee9 Tabling will not runtime if the target runs away from the grab anymore 2014-03-13 20:07:02 -03:00
ikarrus
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
Ikarrus
6147bf6053 Returned armor vest to the HoP's locker 2014-03-12 10:25:29 -06:00
ikarrus
fba4280ec2 Removes HoP's armor and helmet 2014-03-12 08:47:01 -06:00
fleure
b6e7155a24 Changed janitor and atmos tanks slightly 2014-03-10 20:27:21 +00:00
Cheridan
8423e6765c Merge pull request #3002 from Aranclanos/GrabOnLockers
Grabs won't runtime anymore on lockers
2014-03-09 16:10:20 -05:00
MrPerson
6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm
2014-03-08 22:03:03 -08:00
Steelpoint
55beb8c8b3 TakeTwo 2014-03-08 23:50:15 +08:00
Ergovisavi
062f368ce0 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss 2014-03-07 04:24:51 -08:00
fleure
026c991b95 Added atmos and jani watertanks, changed nozzle types 2014-03-07 01:13:19 +00:00
Ergovisavi
a3ce04c000 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss
Item attack changes
2014-03-06 03:17:02 -08:00
Aranclanos
ad3c76ef31 Grabs won't runtime anymore on lockers 2014-03-05 21:20:06 -03:00
Razharas
c548df264b Conflict fix 2014-03-05 06:30:29 +04:00
Incoming
2159f93b63 Moves the code for returning an animate statue to flesh to the statue structure from the statue mob. It will be less checked for here, as it will only look when the timer runs out on the statue structure.
Adds a message to getting unstoned so shitlers don't try to argue that they're still antags.
2014-03-04 13:55:42 -05:00
MrPerson
80a7a2abb4 Replaced a few more Del() and del() calls
Removed cigarette related reagent deleting. It's already done in atom/Destroy()!
2014-03-03 04:51:09 -08:00
MrPerson
3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel
Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm
2014-03-02 21:39:27 -08:00
Razharas
f3ccaa5936 Merge conflicts fix 2014-03-03 05:42:31 +04:00
MrSnapwalk
789134d8f2 Automerge fix
Fixing the conflicts preventing an automerge.
2014-03-02 17:03:35 -06:00
MrSnapwalk
b03fc3d645 More suits, and more fixes.
More suits by Nienhaus, and a few fixes for the contents of lockers.
Also added a dermal armor patch to the Captain's locker, for added head
protection without the downside of helmet-hair.
2014-03-02 16:10:08 -06:00
Razharas
3cb5c7380f Merge pull request #2894 from ChuckTheSheep/Morgue-Slab-Fix
Fixes an oversight in my slab code + New recursive mob check
2014-03-02 12:42:30 -08:00
MrSnapwalk
b6a60a07b4 Makes fancy items obtainable.
Adds a formal-wear crate, makes lawyers have laceup shoes, adds a better
sprite for the memorizer, adds the formal uniforms to each job's closet,
and fixes a typo in the object name of the black jacket. [FORMALNESS
INTENSIFIES]
2014-03-01 19:44:22 -06:00
Ergovisavi
ac269baacb Fixes bullet_act not checking for damagetype on many, many objects.
Replaces Holodamage with Stamina damage, if your stamina damage exceeds your current health, you get weaken(5)'d. Stamina heals itself slowly over time.
Makes the hallucination enemies deal more stamina damage than they did holodamage, but stamina damage heals now so it's mostly for just seeming threatening at the moment.
Adds the Disabler, a gun that does stamina damage. It has a range of your screen, but no more. Adds a disabler crate to cargo (security lock)
Fixes Lasertag ED209's because they were busted as shit
Reduces ED209's view range to 9 from 12, which was several times longer than your screen view, now is only a little bit more
Lastertag now does stamina damage instead of an instant stun for that GRITTY LASERTAG EXPERIENCE
2014-03-01 16:39:22 -08:00
Razharas
2fd5557682 Conflict fix 2014-03-02 04:14:32 +04:00
hornygranny
c31647376e This is for discussion of things that need to be changed to move away from purely stun based combat. Please only comment if you have something to contribute, rather than just saying you like or dislike it.
Shoes do not increase your movement speed
Stun/weaken on basically everything reduced from 10+ to 5 ticks
Time to unbuckle/uncuff self halved
2014-02-27 10:56:06 -08:00
Cheridan
011a78f478 Merge pull request #2902 from Miauw62/actualbranchnamesyounerd
Fixes NODROP not playing nice with tables.
2014-02-25 22:37:09 -06:00
Cheridan
004b005ab2 Merge pull request #2901 from Miauw62/aijgdiajgiojdaigjapgijsgdipjagiojaranisafagaidpjgiaopjgdoiadjgaipgjpijadgijagipjadijigpaijgdipajgdipajdgpiadjgpajgd
Fixed #2899 (NODROP and closets doing weird shit)
stop making retarded branch names miauw
2014-02-25 22:29:39 -06:00
Cheridan
5ec24c8613 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/modules/reagents/Chemistry-Reagents.dm

resolved with Theirs, must manually reapply fixes
2014-02-25 19:39:26 -06:00
ChuckTheSheep
0bba6f4fae Merge remote-tracking branch 'upstream/master' into Morgue-Slab-Fix 2014-02-25 20:21:21 -05:00
ChuckTheSheep
fd8cd6ebc3 Fixes Speaking, Whoops 2014-02-25 13:38:06 -05:00
Miauw
41a9321d2a rip in peace more parems 2014-02-24 19:43:09 +01:00
Miauw
27d0b64032 Fixes NODROP not playing nice with tables.
(thx for submitting bug reports guise)
2014-02-24 19:38:10 +01:00
Miauw
8ed2cdb07a Fixed #2899 2014-02-24 19:25:57 +01:00
Razharas
ba54bd940b Conflict fix 2014-02-24 22:12:02 +04:00
Razharas
3d90e8815e Merge pull request #2827 from Ergovisavi/muh_vision
Adding NVG's/Advanced Mesons to the protolathe, some human vision changes
2014-02-24 07:55:34 -08:00
Razharas
b27d9c7396 Added RPED, some sprites and new power cell path
Your dreams of big part storage and fast machine part exchange came true
14 slot R&D part-only autoseeker/picker/dropper/exchager is in
Added different sprites for better capacitors and scanning modules
Changed the power cell type to be compatible with all this machine
changing faggotry
All sprites here are codersprites so ask nien/WJ for better ones if you
want
2014-02-24 05:14:43 +04:00