Commit Graph

136 Commits

Author SHA1 Message Date
DZD 1c3d247aca Wizard Update Part 1
- Wands will no longer display a missing sprite if you try to fire one
while it is drained. (Only change that wasn't ported from /tg/)
- When using a staff of change on somebody, you can now turn them into a
goat or space bats, and when turning them into a cyborg, there is a
chance of that cyborg being a syndicate cyborg.
- Ports over page-based UI for the Wizard's spellbook from /tg/.
- Ports over the Wand Belt, Staff of Chaos, and Staff of Door Creation
from /tg/. The Wand Belt contains several useful wands, however all of
them have limited charges. The Staff of Chaos will cause a different
projectile spell effect each time it is cast, and can currently imitate
any of the wands. The Staff of Door creation will create wooden doors
over any solid turf they contact, doing so removes said turf.
- Mind swap will no longer remove spells from the wizard due to RNG.
- The charge spell will no longer damage the charge of weapons that
normally recharge by themselves.
- Adds Staff of Door Creation to the Summon Magic list, removes the
staff of change from the normal Summon Magic list and makes it part of
the special list
- If Summon Magic rolls to create an item on the special list, it will
create that item once, and will no longer create anything else from the
special list. (List consists of the Staff of Change, Staff of Animation,
Wand Belt, Staff of Chaos, and Contract).
2015-01-14 21:56:39 -05:00
Fox-McCloud 96a89b4591 Bandolier 2015-01-08 21:20:51 -05:00
Fox-McCloud ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Fox-McCloud 43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Markolie 54f1f1c14f First aid kit name fixes 2014-12-24 14:33:00 +01:00
Markolie 2f8be5a6cc Typo fix 2014-12-24 13:56:43 +01:00
Markolie f03bbf8bc6 Bug fixes 2014-12-24 12:53:49 +01:00
Markolie 19fde1c4a0 Bug fixes 2014-12-17 21:56:37 +01:00
Fox-McCloud 8238638283 Gun Harmonization 2014-12-13 11:18:56 -05:00
Fox-McCloud 4868d3795d Vox and Space 2014-12-09 03:47:46 -05:00
Markolie b8a440f23a Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes 2014-12-07 04:55:48 +01:00
Markolie a1a80c1a27 Minor fixes 2014-12-04 18:18:01 +01:00
SamCroswell 7a3f19d00f Area Tag Fix, Bar Is No Longer Space
The bar is no longer exposed to space via a tile under the booze-o-mat,
fix the area to be unpowered by default.
2014-12-03 19:41:33 -05:00
Fox-McCloud 67f8c7a79a Sprite Updates 2014-12-02 08:49:44 -05:00
Fox-McCloud 4b2e3beb96 Weapon Changes 2014-11-30 08:18:29 -05:00
Fox-McCloud 3b884622c5 Job Changes 2014-11-29 09:10:31 -05:00
Markolie 3b1dc8e487 Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Conflicts:
	icons/obj/weapons.dmi
	maps/cyberiad.dmm
2014-11-27 21:39:01 +01:00
Markolie b66f3effae Bug fixes, implements new copying/faxing system from Bay 2014-11-27 21:00:58 +01:00
Fox-McCloud 261157cb58 AI, PDA, and Other changes 2014-11-26 01:18:49 -05:00
SamCroswell 53cb7776b1 Map Changes, Duffelbag Fix
- Re-did admin room clothing storage
- Added the hammers to the weapon storage
- Replaced the unloaded mechs with loaded mechs
- Added Misc mecha equiptment next to the mechs in crates
- Replaced the Emergency NanoMed on the Syndi Ship with a SyndiMed. Same
thing, different access requirements, different icon.
- Replaced the vending machines with syndicate vending machines on the
Nukeops starting area. These require no access to use, and vend EVIL
items.
- Replaced the Syndicate DS mechs with loaded versions, as they were
unloaded.
- Removed the nonfunctional radio broadcaster on the Ruskie DJ Station.

- Fixed the captain duffelbag duplicate define.
2014-11-22 17:31:56 -05:00
SamCroswell 7c2f2d09d2 Adds Duffelbag, Fixes Inhand for Hammers 2014-11-20 20:04:41 -05:00
Markolie 06b0a7a89f Re-add Dave's changes, nerf remote view/remote talk 2014-11-21 00:17:52 +01:00
SamCroswell 16b5102efa Merge branch 'master' of https://www.github.com/ZomgPonies/Paradise 2014-11-15 00:08:35 -05:00
SamCroswell d2d02e400a Syni Venors 2014-11-14 15:41:55 -05:00
Fox-McCloud f84ca26012 Fixes and Stuff 2014-11-11 22:48:08 -05:00
Fox-McCloud 111b24ceb8 Janitor Rework 2014-11-10 03:17:56 -05:00
Nienhaus 25a92c91fd Ports the TG style Jani Cart. 2014-11-07 22:48:44 -06:00
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
Ccomp5950 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
Zuhayr 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 Nelson 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
Chinsky 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
Boop 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
Mike 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 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
RavingManiac 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