Commit Graph

7445 Commits

Author SHA1 Message Date
Necaladun
1ce1f0df37 Xray laser
Was still at charge cost 50 - up to 500 now
2014-06-17 16:56:20 +09:30
Necaladun
0265660fb2 Stun Revolver Upgrade
Stun revolver uses the old style single shot rather than a beam, but
hits harder.
2014-06-17 16:56:20 +09:30
Necaladun
eb97932ca5 Egun Fix
Eguns now have proper ammo cost, 10 shots standard, not 100.
2014-06-17 16:56:19 +09:30
Cheridan
88aceb454d Update shotgun.dm
shells spin faster
Conflicts:
	code/modules/projectiles/guns/projectile/shotgun.dm
2014-06-17 02:45:09 -04:00
Cheridan
3244291624 Casing rotation
Spent casings ejected from firearms will spin as they 'tumble' towards the ground.
Improved sprites for shotgun shells
Improved sprite for bullet projectile.

Conflicts:
	code/__HELPERS/matrices.dm
	code/modules/projectiles/guns/projectile.dm
	icons/obj/ammo.dmi
	icons/obj/projectiles.dmi
2014-06-17 02:40:47 -04:00
ZomgPonies
044484266d Grav gen fix 2014-06-17 02:03:34 -04:00
ZomgPonies
61b0cb5bd9 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-17 01:20:58 -04:00
Giacomand
8e70f0af6d Fixes the gravity generator not updating your gravity status, so you stop floating.
Conflicts:
	code/modules/power/gravitygenerator.dm
2014-06-17 01:19:42 -04:00
Giacomand
08e6e8f2e2 Finalized gravity bouncing.
Conflicts:
	code/modules/mob/living/carbon/human/human_movement.dm
2014-06-17 01:14:56 -04:00
Giacomand
f32f2b329f Mobs will now slowly bop up and down while in zero gravity.
Conflicts:
	code/game/area/areas.dm
	code/game/turfs/turf.dm
	code/modules/clothing/shoes/magboots.dm
	code/modules/mob/living/carbon/human/human_movement.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/gravitygenerator.dm
2014-06-17 01:13:32 -04:00
Necaladun
a2f7e2f3e8 Random Event Chance Tweaks
Reduce viral outbreak and ninja chances.
2014-06-17 14:36:10 +09:30
ZomgPonies
25853d7d79 Slime surgery runtime fix 2014-06-17 00:22:00 -04:00
ZomgPonies
f84214533a Removing even more unneeded test messages 2014-06-17 00:06:53 -04:00
ZomgPonies
e3ed1c3781 Removed a lot of the useless testing and error logging from the runtime log. 2014-06-16 23:01:41 -04:00
ZomgPonies
cd3a972331 Runtime fix due to Vox nitro tanks 2014-06-16 22:56:30 -04:00
ZomgPonies
ddfae9a035 Got another shuttle controller down. One to go. 2014-06-16 21:42:06 -04:00
ZomgPonies
bd75c061f0 Cargo train fixes 2014-06-16 05:14:30 -04:00
ZomgPonies
ed36dbd6d9 2 new karma jobs -- Brig Physician and Magistrate 2014-06-15 23:40:47 -04:00
mwerezak
93060a2766 Fixes old ferry shuttles (e.g. supply) not being able to use move() directly.
This shouldn't be necessary once the supply and emergency shuttles are
updated to the new system, however it will keep them working in the meantime.
2014-06-15 13:55:44 -04:00
Zuhayr
a80c317cbe More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron.
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/supplyshuttle.dm
2014-06-15 07:58:00 -04:00
ZomgPonies
2097bed55d 3rd mining overhaul commit, fun KEPT. 2014-06-15 07:52:52 -04:00
ZomgPonies
d31a39256e 2nd mining overhaul commit. Fun KEPT. 2014-06-15 07:45:27 -04:00
Zuhayr
521e5e49ef Ironed out some bugs. Everything should be working for testing purposes. 2014-06-15 07:36:21 -04:00
Zuhayr
ef59deb928 First pass on ore distribution map and stationary drilling rig.
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.

Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/modules/mining/coins.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/minerals.dm
	code/modules/mining/satchel_ore_boxdm.dm
2014-06-15 07:35:17 -04:00
Erthilo
6443216183 More Vox clothing. Head and eyes this time.
Conflicts:
	code/modules/clothing/glasses/glasses.dm
	code/modules/clothing/head/collectable.dm
	code/modules/clothing/head/misc_special.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/species/vox/head.dmi
	icons/mob/species/vox/suit.dmi
2014-06-15 06:51:14 -04:00
ZomgPonies
85b8878cbe Made riot helmets and captains space helmet protect against facehuggers 2014-06-15 06:26:41 -04:00
ZomgPonies
d9960d487c Hurrr 2014-06-15 03:58:50 -04:00
ZomgPonies
a211cca4dc Cart fixes 2014-06-15 03:58:19 -04:00
ZomgPonies
c505c0690c Fixes janicart/segway 2014-06-15 02:39:14 -04:00
ZomgPonies
a21ccf0139 Add the other shuttle controllers back in 2014-06-15 01:54:38 -04:00
ZomgPonies
692e7ef435 Fixing biting your own hand off 2014-06-14 23:18:12 -04:00
Loganbacca
80d616e624 Cargo train bugfixes
Also adds admin messaging when someone gets run over.
2014-06-14 22:15:31 -04:00
Loganbacca
083cd19c6a New vehicle framework
- Implements a new vehicle framework
- Adds cargo trains

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-06-14 22:14:53 -04:00
Zuhayr
46f1261573 Amending a runtime in the mmi change.
Conflicts:
	code/modules/mob/transform_procs.dm
2014-06-14 22:05:11 -04:00
Zuhayr
fbac64ddfe Fixes #5245
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2014-06-14 21:56:52 -04:00
Zuhayr
613e0881cf Fixes #5243
Conflicts:
	code/modules/mob/transform_procs.dm
2014-06-14 21:54:52 -04:00
Zuhayr
4fb5a08235 Fixes #5246 2014-06-14 21:53:13 -04:00
ZomgPonies
9f9b2b5ae2 Commenting out the other docking controllers until I get science setup correctly. 2014-06-14 21:38:27 -04:00
mwerezak
e0d3e7e4d7 Adds docking control to ERT shuttle
Also adjusts the location of the centcom shuttle docking controller.

Conflicts:
	code/modules/shuttles/shuttle.dm
	maps/tgstation2.dmm
2014-06-14 21:33:05 -04:00
mwerezak
aa39abacec Adds centcom and admin shuttle docking controllers
Conflicts:
	maps/tgstation2.dmm
2014-06-14 21:29:47 -04:00
mwerezak
3dbb1fe6c9 Adds engineering shuttle docking controllers
Also fixed bad req_access_txt. Was accidentally using req_access_txt
instead of req_one_access_txt. Fixed virology maint not having any
access codes set.

Conflicts:
	maps/tgstation2.dmm
2014-06-14 21:29:25 -04:00
mwerezak
f22c9db34d Streamlined docking code
Server and client now have more consistent responsibilities.
Ferry shuttles will always be forced undocked when moved, even if moved
by admin magic.

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-06-14 21:29:02 -04:00
mwerezak
15641bc88a Adds mining shuttle docking controllers
Conflicts:
	maps/tgstation2.dmm
2014-06-14 21:25:18 -04:00
mwerezak
cdabebba3e Adjusts how undocking signals are used
Now both server and client will to undock concurrently. It looks much
more natural.

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
	code/game/machinery/embedded_controller/simple_docking_controller.dm
2014-06-14 21:23:59 -04:00
mwerezak
cd540fe56d Shuttle console refactoring
Also adjusted the way undocking signals were used.

Conflicts:
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
2014-06-14 21:22:30 -04:00
mwerezak
fbd4c870eb Docking overrides now have a clear purpose
Originally the purpose of the docking override was to allow the shuttle
to move even if it couldn't undock properly (e.g. the doors were stuck
open), however it makes more sense just to have the shuttle take care of
that. This commit now makes the behaviour of the docking overrides line
up with it's new purpose.

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-06-14 21:19:53 -04:00
Nerezza
ad2c9a2550 Make drone light into verb
Removes the penlight and builds a low power LED into the chassis.
Already tested to work locally, won't ghost a light.

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2014-06-14 21:16:08 -04:00
ZomgPonies
8d8d213e3e Merge pull request #253 from GhostAA12/master
Fixes the Rapid Parts Exchange device
2014-06-14 16:00:45 -04:00
ZomgPonies
6a8f016abc Runtime fix 2014-06-14 15:55:05 -04:00
GhostAA12
81c000f0cf Fixes the Rapid Parts Exchange device
Previously did nothing because of missing proc on machinery
2014-06-14 11:41:18 -07:00