Commit Graph
1209 Commits
Author SHA1 Message Date
Fox-McCloud e1c83d7f55 Nuke-Ops-Final 2014-11-06 07:29:16 -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
Fox-McCloud 097cc95bd2 R&D Nerfs 2014-10-25 20:54:25 -04:00
Fox-McCloud 8c1f6431e6 Tweaks and Fixes and Major Map Changed
More Info will be posted directly, later.
2014-10-13 22:00:07 -04:00
Fox-McCloud 9c8326e120 Fix, Tweak, and Revise
fixes a few non-functioning things, adds in a few new features,
basically the previous patch minus "controversial" stuff.
2014-09-29 02:10:28 -04:00
Ccomp5950andZomgPonies 3ca02d3c5b Fixed the font tag on mouse traps description.
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
2014-08-16 20:53:29 -04:00
Artorp 4c59644d95 Enable medical belt quick pickup
Using a medical belt on a bottle will attempt to pick up all bottles on
the tile.
2014-08-09 02:51:15 +02:00
ZomgPonies 509af0b236 Stun revolver rebalance. 25% more powerful than regular taser. Lost it's insta-stun 2014-08-04 01:54:27 -04:00
ZuhayrandZomgPonies ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit.
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
Rob NelsonandZomgPonies f7b516a5ab Shit catches on fire now
Conflicts:
	code/ZAS/Fire.dm
	code/game/objects/items/weapons/storage/bible.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/modules/mob/living/living_defines.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photography.dm
	code/setup.dm
2014-07-18 06:32:15 -04:00
ChinskyandZomgPonies 71169c7903 Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand().
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.

Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
2014-06-24 12:02:29 -04:00
BoopandZomgPonies f4cf6b3a0d Fix latex gloves box not having the right sprite 2014-06-18 22:15:34 -04:00
ZomgPonies 0d57c3ef4d Tune bag choking 2014-06-06 00:06:17 -04:00
ZomgPonies 4683a12a35 Fix for storage bags 2014-06-05 22:17:01 -04:00
ZomgPonies caaf56dbcc Bugfix for bag choking 2014-06-05 17:09:27 -04:00
ZomgPonies b9fe3ab514 Added choking people with plastic bags. 2014-06-05 04:43:30 -04:00
ZomgPonies 06bbfcf150 Final Nations patch before live testing. This is going to be painful. 2014-05-27 20:09:10 -04:00
MikeandZomgPonies bf98751d8b Clean up check for item being equipped
Moved some common code to item.dm. Someone should probably take a look
at get_equipped_items() in inventory.dm sometime in the future.
2014-04-20 03:50:23 -04:00
Rob NelsonandZomgPonies 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
RavingManiacandZomgPonies a06f8b910c Inflatable barrier boxes added to engineering. Inflatable barrier crates can be ordered by the QM. Briefcase icon_state fixed.
Conflicts:
	maps/backup/tgstation-redux-WIP.dmm
2014-04-19 15:51:07 -04:00
Necaladun cdb0a47d0b Fix satchels
I herped a derp and broke satchels
2014-04-16 16:26:38 +09:30
Necaladun c199a41b21 item and map
Custom items for mark and the map uploaded
2014-04-13 15:09:27 +09:30
alex-gh 521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00
ArynandZomgPonies 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 1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
Jesus Hussein ChrisandZomgPonies 95f7280781 Generic attack sounds for all melee weapons
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.

Conflicts:
	code/game/gamemodes/wizard/artefact.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/weapons.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
2014-01-22 10:15:43 -05:00
Rob NelsonandZomgPonies d49e6d3bf4 Standardize CLUMSY
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00
ZomgPonies cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
AranclanosandZomgPonies eb76256f04 Adds the captain's medal to the medal's lockbox.
Fixes issue 2358

Conflicts:
	code/game/objects/items/weapons/storage/lockbox.dm
2014-01-16 21:55:00 -05:00
DJSnapshotandalex-gh 8f9e08150e mecha fixes 2014-01-02 20:51:47 +01:00
ZomgPonies a0d866b366 Popable cans and beer cans 2013-12-31 21:44:21 -05:00
ZomgPonies dcaeea24bf Adding large cardboard boxes 2013-12-25 07:06:13 -05:00
ZomgPonies 9ad437b8c5 Adding checks for LAssailant everywhere whee 2013-12-23 04:57:44 -05:00
ZomgPonies cc05932fb5 Emag ATM, cash bags! 2013-11-25 05:29:51 -05:00
ZomgPonies 859ed8bf38 Clown Planet V2 2013-11-20 21:47:00 -05:00
ZomgPonies aadb98587e Hand labeller fix 2013-11-09 09:18:35 -05: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
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 28d8f6f738 Re-education campt for naughty players. Glory to Cyberiad! 2013-10-30 03:13:47 -04:00
Fox-McCloud 9a2569f974 Seed Extractor
TG's portable seed extractor, icons, and necessary code for it to work.
2013-10-27 03:29:41 -04:00
ZomgPonies 5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies 52b1ed2a25 Updated blank shotgun shells to birdshot 2013-10-04 02:58:38 -04:00
ZomgPonies fcbdb53bbb Bunch of FAT fixes 2013-09-24 19:00:40 -04:00
ZomgPonies b0aff645a3 Massive traitor item overhaul 2013-09-23 05:41:53 -04:00
Erthilo 3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00
Segrain d51809faa2 Separating autoinjectors box from injector box. 2013-08-02 19:30:02 +03:00
comma bbdcb81868 Added advanced medikits. 2013-08-01 09:58:09 +04:00
comma c8f5b98a95 Autoinjectors.
Now they are one-use, as they were intended.
You can still change their contents with syringes before they are used.
To mitigate their one-use nature, box of them is added to medical closets and supply pack.
2013-08-01 08:12:56 +04:00