Commit Graph

238 Commits

Author SHA1 Message Date
Fox-McCloud 3b884622c5 Job Changes 2014-11-29 09:10:31 -05:00
Markolie b66f3effae Bug fixes, implements new copying/faxing system from Bay 2014-11-27 21:00:58 +01:00
Markolie dd70ba2030 Adds a psychiatrist's locker to the psychiatrist's locker, with a straight jacket, syringe and a pill bottle with 2x Citalopram and 2x Methylphenidate 2014-11-22 20:58:26 +01:00
Markolie b2d0e26a6d Add meson goggles to atmos lockers, add alert camera monitors to engineering 2014-11-14 15:55:38 +01:00
Fox-McCloud 111b24ceb8 Janitor Rework 2014-11-10 03:17:56 -05:00
Fox-McCloud 6dfc1f4d70 Merge pull request #482 from SamCroswell/master
Nukeops Update
2014-11-08 11:05:51 -05:00
SamCroswell 722fd6a1e0 Nukeops Update
- Gave the nukeops leader the ability to choose the name of their team.

- Gave the Bulldog an in-hand icon identical to the c20r until we can
figure out how to add left hand right hand icons without breaking
everything.

- Added a helmet for the Syndicates, identical to the helmet they
already had with a special icon.

- Replaced the SWAT helmet they had in their lockers with the new Syndi
helmets.
2014-11-08 10:51:20 -05:00
Fox-McCloud bf93e9caaf Jetpacks for Sydnies! 2014-11-08 01:15:46 -05:00
Fox-McCloud e1c83d7f55 Nuke-Ops-Final 2014-11-06 07:29:16 -05:00
Fox-McCloud 9b6dc5cdb5 Merge pull request #458 from Markolie/master
Magistrate/Psych Office shutter fixes, telescience console UI update, camera fixes, borg movement fix, security windoor fix, CentComm identification computer fix, locker fixes
2014-11-06 03:18:14 -05:00
Fox-McCloud dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
Fox-McCloud 650c9a3e3c Nuke Ops Rework Phase 1 2014-11-03 23:45:00 -05:00
Markolie a0abc79368 Personal lockers can no longer be locked from the inside. Also fixes the "It won't budge" message which kept appearing. Per https://github.com/ZomgPonies/Paradise/issues/452. 2014-11-04 03:13:03 +01:00
Fox-McCloud f77eb5c914 Traitor Gear and Balance 2014-10-28 01:35:03 -04:00
Graham Lloyd 2c4e98a726 Fireaxe cabinet hacking now fails if player moves away 2014-08-04 22:15:12 -04:00
Bone White abde4759ae Advanced Medical Hud Glasses (medihud + flash protection)
For blueshield and brig physician.  Also added the item to blueshield
locker.  Item allows medical record viewing/editing.  I have _NOT_ added
security record viewing/editing.
2014-07-27 16:06:35 +01:00
Necaladun 467c289cc2 Removed gun and armour from HoP closet
Removed egun, helmet and armour from HoP because they are NOT sec.
2014-07-22 18:48:49 +09:30
ZomgPonies 1eb02b5cf4 Overhauled holsters and webbings 2014-07-15 04:02:24 -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
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
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
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 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 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 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
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 7048545d6d Projectile code overhaul 2013-10-30 10:32:21 -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
ZomgPonies 7ffdc68add Adding /tg/'s laserpointers 2013-09-06 08:31:28 -04:00