Commit Graph

7861 Commits

Author SHA1 Message Date
ZomgPonies dc56dc8958 Investigate PDA messages 2014-07-25 12:32:35 -04:00
ZomgPonies ed1e3f8bc4 Fixed plasma ore 2014-07-25 11:36:08 -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
Zuhayr 13797e99ed New machines, adjusted Cael's seeds, rewrote space vines.
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/hydroponics.dm
	code/modules/hydroponics/grown_inedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
2014-07-25 10:06:19 -04:00
Rob Nelson 4c32f5f946 Fix jukeboxes needing reset after shuttle movement, [CLASSIFIED], warning fix.
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/atoms_movable.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/nano/nanomapgen.dm
2014-07-24 21:01:49 -04:00
Rob Nelson de17dce900 Nothing to see here. 2014-07-24 20:54:59 -04:00
ZomgPonies c0c3262d9b Compile fix 2014-07-24 19:10:36 -04:00
Loganbacca 936ad57e83 Cargo train fixes
- Visual tweak for mobs on trolleys
- Fixed a teleportation bug when boarding trains from other trains
- Fixed a runtime involving on_click code
2014-07-24 18:44:12 -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
DJSnapshot c4a06ef7c1 temporary fix for #4907 2014-07-24 18:39:24 -04:00
DJSnapshot be6f4b74a8 Updates to gun targeting UI. Fixes #5710
Conflicts:
	code/_onclick/hud/human.dm
	code/modules/client/preferences_toggles.dm
2014-07-24 18:36:52 -04:00
mwerezak e180bcc2f3 Fixes icons not being updated for necrosis 2014-07-24 18:30:15 -04:00
mwerezak effd7545bc Adjusts the rate that infections deal toxin damage
Conflicts:
	code/modules/organs/organ_external.dm
2014-07-24 18:30:00 -04:00
mwerezak 573cbaf63a Fixes fever temperature not being reached
Conflicts:
	code/modules/organs/organ_external.dm
2014-07-24 18:27:58 -04:00
ZomgPonies d422dd7435 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-24 16:36:54 -04:00
ZomgPonies 8fc1cc3024 Remove RadioChatter toggle as redundant and broken. Ghosts can use GhostRadio toggle while players can turn off their headsets ICly. 2014-07-24 16:35:22 -04:00
ZomgPonies 79bebdc11d Merge pull request #323 from IcyV/georgemelons
Changes a brain damage message
2014-07-24 15:37:13 -04:00
Bone White edef61b2c7 More virology symptoms
Pain symptoms, and more antidepressant producing viruses.  Made a change
to the most powerful antidepressant, to make it break their mind more
often if over 5 units, to simulate overdosing of this potent chemical
2014-07-24 20:12:50 +01:00
IcyV 8697118f8d Changes a brain damage message
From "faggot traitor" to "damn traitor" to follow more closely to the server rules.
2014-07-24 02:54:48 -07:00
Bone White 3d4dcd08c7 Overdose mini-patch
Stops sleepers giving people overdose amounts.
2014-07-24 03:38:53 +01:00
ZomgPonies 375a2b7645 Merge pull request #320 from IcyV/chemaddition
Expanded upon overdose system
2014-07-23 15:19:21 -04:00
IcyV 51033b9847 Expanded upon overdose system
Adds brute, burn, and oxy damage as potential overdose effects.
2014-07-23 12:14:17 -07: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 7cbd6b1a81 Fix fatties 2014-07-23 12:22:37 -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
Ccomp5950 3f110c5bf7 screen_shake (meteors, etc.) made more robust and works with aiEyes
Before:  multiple screen_shake's could queue up prior to screenshake being set on the mob setting
oldeye on the last one to queue up to be the random location from the previous screen shake
so sometimes peoples clients were stuck on a location instead of back on the mob.

Now we set screenshake before the spawn so we don't spawn up multiple screen_shakes on the same mob.

Test:  Be ghost, hammer the spawn meteors secret 10 times or so, watch as your camera returns back to your mob.

Yay.

Conflicts:
	code/modules/mob/mob_helpers.dm
2014-07-23 09:04:10 -04:00
Ccomp5950 0beada11c7 Chem Master won't resize it's window by adding a scroll bar on selection.
Fixes #5574

Conflicts:
	code/modules/reagents/Chemistry-Machinery.dm
2014-07-23 09:01:57 -04:00
mwerezak 0f49c165d2 Tweaks infections
Conflicts:
	code/modules/organs/organ_external.dm
2014-07-23 08:59:23 -04:00
Ccomp5950 fa8afbc09e Tasers will now cause movement slow downs on the first hit
Before:  Tasers do 40 halloss damage and that drops to 39 on next life() tick so most people won't be slowed down by the first taser hit.

After:  If you have any halloss you will slow down some.  I've set it at 1 delay for every 10 halloss, this might need adjusting (15 instead of 10 possibly)

Conflicts:
	code/modules/mob/living/carbon/human/human_movement.dm
2014-07-23 08:54:09 -04:00
d3athrow e93220cfd0 alert windows that close themselves after enough time. 2014-07-23 08:49:42 -04:00
ZomgPonies d21cf838d7 Merge pull request #316 from Bone-White/master
Virology Update
2014-07-23 08:47:06 -04:00
Bone White 16a9025ef1 Virology Update
new/altered symptoms, including a lot of empty symptoms especially for
higher viruses.
2014-07-23 03:13:04 +01:00
ZomgPonies f491b31d2b PR fixes 2014-07-22 20:05:26 -04:00
ZomgPonies 1812fe529d Merge pull request #315 from IcyV/overdose
Fixed version of a trial overdose system.
2014-07-22 19:45:06 -04:00
ZomgPonies 62c5b3e972 Merge pull request #313 from VampyrBytes/master
rewrite for DF/CM and grill
2014-07-22 19:42:23 -04:00
IcyV 6b4d2f7c82 Fixed version of a trial overdose system.
Applies basic toxin damage when a volume threshold is met.
2014-07-22 16:39:16 -07:00
ZomgPonies a422f28445 Oops 2014-07-22 18:32:08 -04:00
ZomgPonies 14b7c17b6a Spider nerf 2014-07-22 15:11:03 -04:00
ZomgPonies e9bb127f70 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-22 14:59:15 -04:00
Walter0o b24aafa3d6 borer mindcontrol release hotfix
forgot to remove this remnant ckey check
2014-07-22 13:54:19 -04:00
ZomgPonies b797cf5152 Merge pull request #311 from mwerezak/paradise-docking
Fixes specops shuttle messages
2014-07-22 08:24:42 -04:00
Necaladun ded5462196 Fluff items
Ion chef medal and purple zippo
2014-07-22 17:51:02 +09:30
mwerezak 931f592fae Fixes specops shuttle messages
Specops messages were reversed due to paradise using a different values
for specops shuttle location.
2014-07-21 20:27:26 -04:00
Mark Aherne 992ceecd4e NanoUI updates.
* Map gen verb is now limited to those with server access.
* Added Z layer support.

Conflicts:
	code/modules/admin/admin_verbs.dm
	nano/images/nanomap.png
2014-07-21 18:54:19 -04:00
VampyrBytes 4113b531af rewrite for DF/CM and grill
rewrite cos damn!

No more spam names... worst they can get is one of each type in a name.
CM won't accept anything that's been cerealized (at any point), DF and
grill will accept things that have been in them before, but you'll end
up with a burned mess, a cloud of smoke, and the chance of a small fire
2014-07-21 20:37:25 +01:00
ZomgPonies 4b98dc1ff4 Xeno nerf 2014-07-21 10:08:02 -04:00
ZomgPonies 8b703f55af Made wizard spells into various subtypes 2014-07-21 09:40:42 -04:00
ZomgPonies d55450b8ee Merge pull request #310 from IcyV/testing
Reverts hyperzine to its previous state, keep its addictivness.
2014-07-21 07:09:57 -04:00