Commit Graph

919 Commits

Author SHA1 Message Date
Fox-McCloud 8238638283 Gun Harmonization 2014-12-13 11:18:56 -05:00
Markolie 37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
Fox-McCloud cd6814e380 Merge pull request #48 from Markolie/master
Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes
2014-12-06 22:59:38 -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
DZD b951d5a8f8 IT WOOOOOOOOORKS
- Fixed pAI master interface.
- Removed debug code and redundant and unused proc.
2014-12-06 16:19:47 -05:00
DZD 0c75432620 Merge remote-tracking branch 'upstream/master' 2014-12-06 13:09:13 -05:00
Fox-McCloud 21a1c0bc83 Stunning Changes 2014-12-06 02:33:31 -05:00
DZD dd631d4806 Migrating Bay pAI Drone Form Port 2014-12-02 18:00:24 -05:00
Fox-McCloud 67f8c7a79a Sprite Updates 2014-12-02 08:49:44 -05:00
Fox-McCloud 805c638adf Tech Shells 2014-11-30 06:36:31 -05:00
Markolie bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
Fox-McCloud 3b884622c5 Job Changes 2014-11-29 09:10:31 -05:00
Markolie ae8f08e2b8 Fixes reflection, various security level fixes, gamma armory update, communication console fixes 2014-11-29 02:05:42 +01:00
SamCroswell 5d6abde5ed Deathsquad Cyborgs
Adds Deathsquad cyborgs. The only reason these really exist is because I
was bored, but hey! They come equipped with the latest in adminboos
gear, including a fully functional pulse rifle and esword, and a cell
that has 50,000 energy! What could go wrong?
2014-11-27 01:38:52 -05:00
Fox-McCloud 7e9f669f44 Merge pull request #527 from Markolie/master
Adds Mortician, vomit mask fix, fix for missing images for various jobs
2014-11-26 15:14:52 -05:00
Markolie 7554748a26 Adds Mortician, vomit mask fix, fix for missing images for various jobs 2014-11-26 20:44:06 +01:00
Fox-McCloud 261157cb58 AI, PDA, and Other changes 2014-11-26 01:18:49 -05:00
melandor0 6dec83b98c -SM drill
commented out the supermatter drill until we can find a use for it/a way
to balance it
2014-11-24 03:41:46 +01:00
melandor0 72196cd272 Merge pull request #119 from ZomgPonies/master
sync
2014-11-24 02:45:57 +01:00
Markolie 30c1960fe8 Adds Syndiborg to NukeOps, enables shortcuts for borgs/drones, notifies the AI of borg changes 2014-11-23 07:52:38 +01:00
Markolie 59edf2701d Makes SMES'es and Vending Machines constructable and upgradeable, gives borgs recorders 2014-11-18 20:36:40 +01:00
Fox-McCloud be3e2740c5 PDA Fix 2014-11-10 20:53:38 -05:00
Fox-McCloud 111b24ceb8 Janitor Rework 2014-11-10 03:17:56 -05:00
melandor0 01cc6409e7 supermatter drill
New traitor item
2014-11-06 19:28:34 +01:00
Fox-McCloud 4fa54c7dc0 Nuke Ops Map 2014-11-06 11:21:59 -05: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 393ba993e2 Syndicate Bomb Port 2014-10-29 04:21:31 -04:00
Fox-McCloud f77eb5c914 Traitor Gear and Balance 2014-10-28 01:35:03 -04:00
Bone White 5f56a28a8a Radiation Laser Update
Hid message when missing.

Added all medical jobs + brig phys to the requirement of jobs to
purchase this traitor item.

As requested by Fox.
2014-10-27 02:24:06 +00:00
Bone White 42867b255d Added Radiation Laser
Traitor item, cmo/doctor/virologist only.  3 TC cost, looks like a
health analyzer but is a delayed radiation + stun effect on attack.  Has
recharge time and configurable settings.

Fox did most of the work, I just fixed it.
2014-10-26 01:08:18 +00: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
ZomgPonies b314db6296 Merge pull request #394 from VampyrBytes/master
Genetics fixes
2014-08-18 19:19:58 -04:00
mwerezak df900e05cb Adjusts train supply costs 2014-08-16 21:23:10 -04:00
VampyrBytes cfef299686 Genetics fixes
Fixes issue with getting target in remote talk, remote view and empath
Fixes Empath  not recharging
Fixes inability to cancel remote view
Fixes Grays not starting with remote talk
2014-08-16 11:51:17 +01:00
iamgoofball 4330a339cd beep book goonfabs 4 i fucking hate git etc etc. 2014-08-14 12:27:15 -07:00
Jeremy Liberman a4196cb745 Add Vox Heist directive and call shuttle on completion of Directive X
Conflicts:
	baystation12.dme
	code/controllers/emergency_shuttle_controller.dm
	code/modules/mob/mob.dm
2014-08-06 23:12:24 +02:00
JimTheCactus ba3241fadf Merged getFlatIcon rendering from tgstation
Based on tgstation #2826. This is not all of it though.
2014-07-31 17:03:05 -04:00
SamCroswell 94dbad82a4 Alien Tweaks, Commented Out Detomatix 2014-07-30 00:53:56 -04:00
Zuhayr a7ffa5747b Fixed diona pods being mutable, fixed a few other tweaks, added cuttings. 2014-07-29 14:44:15 -04:00
ZomgPonies b33df4745c Removed deprecated power generation stuff (AM, RUST) to free up more procs 2014-07-25 11:33:37 -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
Loganbacca 0e9e9fe596 Cargo train update
- Adds sprites (thanks to Bishop)
- Adds order-able train cargo crates

Conflicts:
	code/datums/supplypacks.dm
	code/modules/vehicles/cargo_train.dm
	icons/obj/vehicles.dmi
2014-07-24 18:43:13 -04:00
PsiOmega df59d8cbc7 Makes it possible for the AI to alt+left click turfs in camera view and grants ctrl/alt shortcuts to the turret control.
AI can now alt+left click turfs in camera view to list and interact with objects in the status tab. For example allows for interacting with emergency shutters beneath grills.
alt-clicking doors now notifies the AI when they are electrified/un-electrified as, unlike most other shortcuts, this doesn't have a visual cue.
When interacting with doors and the AI-control is disabled hacking is now automatically initiated, as if the AI had attempted to open the door 'menu'.
When borgs/AIs try to interact with an emagged door they now receive a feedback message that it's unresponsive.

Parts of implementation done by porting code from tg-station.

Conflicts:
	code/_onclick/ai.dm
	code/_onclick/click.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
	code/modules/mob/mob.dm
2014-07-23 14:55:03 -04:00
ZomgPonies 431ab486b3 Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row) 2014-07-23 11:04:07 -04:00
ZomgPonies 800d5b4b0b Revert "Made wizard spells into various subtypes"
This reverts commit 8b703f55af.
2014-07-23 10:58:20 -04:00
ZomgPonies 8b703f55af Made wizard spells into various subtypes 2014-07-21 09:40:42 -04:00
ZomgPonies 4e1d24609f Fireball explosion fixes 2014-07-20 04:31:32 -04:00
ZomgPonies 8bf4fc4418 More faction stuff for wizards 2014-07-20 03:52:40 -04:00