Commit Graph

411 Commits

Author SHA1 Message Date
ZomgPonies
01ce1db6ff Fix drag and drop climbing, finally 2014-07-18 17:35:35 -04:00
ZomgPonies
4bfb46037f Moar Object verb removal/switch to right-click 2014-07-15 09:18:37 -04:00
ZomgPonies
1eb02b5cf4 Overhauled holsters and webbings 2014-07-15 04:02:24 -04:00
Zuhayr
e203cce645 Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing.
Conflicts:
	code/game/objects/structures.dm
2014-06-29 12:03:39 -04:00
Zuhayr
727d7400ee Shuffling around table and crate knock/climb procs.
Conflicts:
	code/game/objects/structures.dm
2014-06-24 06:59:42 -04:00
Zuhayr
a06621b7af Makes table/crate falling a bit more dangerous. 2014-06-24 06:56:07 -04:00
Zuhayr
7ad261bd2f Allows climbing onto tables and crates, also adds falling off if you are dumb enough to stand on one that is flipped or opened.
Conflicts:
	code/game/objects/structures/tables_racks.dm
2014-06-24 06:52:13 -04:00
SamCroswell
740991092a Nukeops Weapons Rework
Nukeops now start with a Stechtkin Pistol instead of the C-20r.
In addition, they now have more items available to purchase in their
uplink (Exclusive to Nukeops). They are as follows:
C-20r - 6TC
L6SAW - 10TC
C-20r Mag - 1TC
L6SAW Mag - 3TC
Stechtkin Silencer - 1TC
Advanced Medkit - 3TC

The prices are, of course, subject to change as we observe further
Nukeops rounds.
2014-05-04 10:24:48 -04:00
SamCroswell
f4ef7c192b Map changes, new Ninja masks
Map changes including: RnD layout change, new customs lounge, xenoarch
windows fix, and more. Also added a few new Ninja masks in prep for some
bigger changes I have planned.
2014-05-03 18:35:10 -04:00
Rob Nelson
56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog.
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
2014-04-19 20:47:41 -04:00
alex-gh
521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00
Aryn
072bdcde60 I think I fixed everything it is possible to stuff a light source into.
Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/Sleeper.dm
	code/game/objects/structures/transit_tubes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/recycling/disposal.dm
2014-03-21 09:58:54 -04:00
ZomgPonies
c751ee454c Small fixes 2014-03-06 22:45:38 -05:00
ZomgPonies
7ad775b0a2 Statue fixes 2014-03-06 19:59:07 -05:00
ZomgPonies
d15a9c1b99 Museum first iteration 2014-03-06 16:33:41 -05:00
ZomgPonies
1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
RKF45
c69ddf76ec Reintroducing the dough-based cooking system.
Conflicts:
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
2014-02-01 19:22:22 -05:00
Rob Nelson
c3b021e246 Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode.
And holy shit it's fast

Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/pipes.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/rechargestation.dm
	code/game/objects/structures/crates_lockers/crates.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mining/mine_turfs.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/cable.dm
	html/changelog.html
2014-01-29 23:45:21 -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
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -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
ZomgPonies
a0d866b366 Popable cans and beer cans 2013-12-31 21:44:21 -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
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
12b8ae8d76 Magic Overhaul 2013-12-14 05:54:03 -05:00
ZomgPonies
abcfa2fce0 Crate fixes 2013-11-30 07:58:18 -05: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
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
Fox-McCloud
91026fba82 Hydro+Xenoarch+Sprites
Few changes to Xenoarch finds, adds hydroponics plants, updates a couple
sprites, and removes NT Rep from various traitor lists.
2013-11-01 23:46:37 -04:00
ZomgPonies
7048545d6d Projectile code overhaul 2013-10-30 10:32:21 -04:00
ZomgPonies
2c0614d3af Replaces HasEntered() with Crossed() and reduces redundant checks on turf/Enter() 2013-10-28 06:45:15 -04:00
ZomgPonies
29a73ce80e Fixed new clickcode bugs 2013-10-14 01:28:00 -04:00
ZomgPonies
5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies
e708b92560 Paramedic clothing 2013-09-30 01:14:05 -04:00
ZomgPonies
9bde25863f Revert "Had to disable bees TEMPORARILY because string limit"
This reverts commit 89780436fa.
2013-09-15 23:27:55 -04:00
ZomgPonies
89780436fa Had to disable bees TEMPORARILY because string limit 2013-09-15 21:20:21 -04:00
ZomgPonies
c1222034ee BS12 -> Ponies merge 2013-09-09 10:51:16 -04:00