Commit Graph

336 Commits

Author SHA1 Message Date
Rob Nelson
e3a2a9238d Fix typo before someone notices. 2014-01-24 12:24:14 -05:00
ZomgPonies
47e8c640a2 New display case code 2014-01-24 12:23:26 -05:00
Ergovisavi
7ad68dd693 Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash
Hostile mobs with environment smash will also unbuckle themselves by destroying whatever they're buckled to when angered.

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/game/objects/structures/tables_racks.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
2014-01-23 23:31:36 -05:00
John Smith
7a10f3c626 Black Baseball Caps [FIXED]
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
2014-01-22 11:07:39 -05:00
Rob Nelson
22a2df1115 Standardize HULK.
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
2014-01-21 22:45:40 -05:00
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
Razharas
8f71ea55e3 Added tools and time handling
Well yeah
2014-01-21 21:05:50 -05:00
Razharas
56e56b31a6 Implemented crude crafting
Debug messages are still inside, pushing only cozx pete asked me to

Conflicts:
	code/_globalvars/lists/objects.dm
	code/game/objects/structures/tables_racks.dm
2014-01-21 21:05:42 -05:00
ZomgPonies
65d023dd93 Facehugger to Full alien, all player controlled 2014-01-19 16:45:20 -05:00
ZomgPonies
90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
Rob Nelson
8a6ea1d5c9 Fix multiple bugs with catwalks.
* Fixes catwalks not having space underneath them
* Fixes not being able to build catwalks
* Catwalks destructible with screwdriver
* Catwalks autoupdate icons with neighbors

Conflicts:
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	html/changelog.html
2014-01-11 20:43:31 -05:00
ZomgPonies
ab8422f5aa More hull resistance tuning 2014-01-11 06:01:30 -05:00
Rob Nelson
2b1e308e31 Fix #384 - Fridges can be opened while welded shut. Also discovered this extended to secure lockers.
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	html/changelog.html
2014-01-10 02:03:51 -05:00
Rob Nelson
ea5784a4aa Fix for #382 - Bombs not deleting themselves and the fridge they're in.
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2014-01-10 02:02:34 -05:00
Rob Nelson
dbe20f8216 Fix for #383 - C4 deleting fridges full of corpses. 2014-01-10 02:01:19 -05:00
Rob Nelson
5b6648a2c9 Fix #384 (possibly): Welding a fridge/freezer does nothing. 2014-01-10 02:00:51 -05:00
YotaXP
b7efb1b7ed Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm

Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/detectivework/scanner.dm
2014-01-08 07:14:16 -05:00
ZomgPonies
e9feda83cb Crematorium typo 2014-01-04 21:33:04 -05:00
ZomgPonies
a0d866b366 Popable cans and beer cans 2013-12-31 21:44:21 -05:00
ZomgPonies
47b19fc653 Player-controlled giant spiders 2013-12-30 18:18:02 -05:00
ZomgPonies
5e3dca39a1 Supply pack bugfixing 2013-12-30 12:46:44 -05:00
ZomgPonies
04542065e5 Tons of new Mafia-theme stuff 2013-12-29 14:30:29 -05:00
ZomgPonies
1a58a959b6 Morgue fix 2013-12-29 13:52:58 -05:00
ZomgPonies
ae3ff027a9 Morgue/Crematorium Update 2013-12-29 13:25:31 -05:00
ZomgPonies
39a86ccc8e Gun cabinet sprite fix 2013-12-28 14:00:40 -05:00
ZomgPonies
9bd4cc07db Adds kittens 2013-12-28 12:58:54 -05:00
ZomgPonies
20ae80510a Adds gun cabinets 2013-12-28 11:25:11 -05:00
ZomgPonies
55eb99315e New security gasmasks 2013-12-28 09:31:53 -05:00
ZomgPonies
04a00e067f Added sarcophagai to clown planet 2013-12-22 10:00:36 -05:00
ZomgPonies
b9f5b511d3 New signs! 2013-12-22 06:36:11 -05:00
ZomgPonies
e57f11c5f9 Buildable Poker Tables 2013-12-20 22:03:32 -05:00
ZomgPonies
62b0b49659 Brain Borer Overhaul 2013-12-19 03:32:19 -05:00
ZomgPonies
12b8ae8d76 Magic Overhaul 2013-12-14 05:54:03 -05:00
ZomgPonies
80e78d1a03 Bugfixes 2013-12-11 19:23:04 -05:00
ZomgPonies
2cac7bcd42 Plasma windows don't change color 2013-11-30 20:39:04 -05:00
ZomgPonies
4c7fa06c23 Colored Windows 2013-11-30 16:33:53 -05:00
ZomgPonies
1be12ea930 New Barsigns 2013-11-30 15:55:29 -05:00
ZomgPonies
abcfa2fce0 Crate fixes 2013-11-30 07:58:18 -05:00
ZomgPonies
0bfeb40449 Had to funpolice HONK mech and snowmobiles because players. 2013-11-29 07:50:54 -05:00
ZomgPonies
064782ffaa Addes snowmobiles to clown planet because HONK 2013-11-27 09:19:07 -05:00
alex-gh
1fa398a0ec merge fixes 2013-11-27 08:05:09 +01:00
alex-gh
8cf3bc4a90 Makeshift weapons misc fixes 2013-11-27 07:27:01 +01:00
Cheridan
7bdeb898fc Makeshift weapons integration 2013-11-27 02:50:34 +01:00
ZomgPonies
348faebe7c Pretty much finished new sec levels Yay 2013-11-26 14:36:36 -05:00
ZomgPonies
383b0c6f64 Clown Planet bugfixes 2013-11-21 06:44:37 -05:00
ZomgPonies
859ed8bf38 Clown Planet V2 2013-11-20 21:47:00 -05:00
SamCroswell
fb9da163c7 Bluesheild Locker Sprite and Dave's fluff item 2013-11-12 19:27:08 -05:00
alex-gh
30fe4f5f43 Moved death alarm implants from blueshield locker to his spawn equipment. 2013-11-11 06:23:25 +01:00
alex-gh
75ecb51cbb Blueshield closets are now their own type of closet. Added boxes of death alarm implants. 2013-11-04 22:38:08 +01:00
ZomgPonies
8bf368f547 Telescience! 2013-11-04 07:48:43 -05:00