AlexanderSeto
f188097edd
Removed commented out code from smartfridge
2014-05-12 14:55:27 -07:00
AlexanderSeto
4b10b251cb
This adds the medical fridge object and places it in medbay.
2014-05-12 14:49:52 -07:00
Necaladun
3d7fd0f83e
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-05-13 03:52:57 +09:30
Necaladun
38b92bde0e
Vox jumpsuits
...
Ripped vox jumpsuits for pancakeflipper
2014-05-13 03:34:46 +09:30
alex-gh
ca9d735b23
Map fixes - mostly disposals
2014-05-12 15:51:12 +02:00
Ccomp5950
1944048870
Canceling an IRC-adminPM will not send a blank message.
...
Ooops
2014-05-12 04:49:03 -04:00
Ccomp5950
327af807c1
You can now request player notes through IRC bots.
...
Conflicts:
code/world.dm
2014-05-12 04:48:32 -04:00
Ccomp5950
ef9c8875d3
IRC-AdminPM is limited to 400 characters.
2014-05-12 04:45:38 -04:00
Ccomp5950
385a357e3d
Added stationtime to ?status check in world/Topic()
2014-05-12 04:45:26 -04:00
Ccomp5950
15c889f186
Code for new bots allowing admins to PM Players via IRC and vice versa.
...
Conflicts:
code/modules/ext_scripts/irc.dm
2014-05-12 04:45:13 -04:00
Zuhayr
b6f3649264
Allowed drones to decompile dead but not gibbed clientless drones.
2014-05-12 04:41:38 -04:00
Zuhayr
16b97cd58f
Simplified robot repairs a lot for drones. No more organ damage for them.
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2014-05-12 04:41:17 -04:00
Zuhayr
69e4fa1801
Added a cooldown to CLONG CLONG from moving in disposals.
2014-05-12 04:38:29 -04:00
Zuhayr
e1bfc3cfe0
Allowed magnetic grippers to remove APC cells.
...
Conflicts:
code/modules/power/apc.dm
2014-05-12 04:38:08 -04:00
Zuhayr
8c3ea8dac6
Made drone control consoles buildable/researchable.
2014-05-12 04:36:19 -04:00
Zuhayr
c599199a8e
Fixes #4911
2014-05-12 03:11:15 -04:00
Zuhayr
0eb68ed3aa
Fixes #4744
2014-05-12 03:10:59 -04:00
Zuhayr
fbbb3b50ce
Fixes #4923
2014-05-12 03:10:37 -04:00
Zuhayr
dbdc032e49
Fixes lack of update on drone fabricator console.
2014-05-12 03:09:34 -04:00
Zuhayr
c46505f633
Stops drones from self-destructing or being locked down by the RD console.
2014-05-12 03:08:55 -04:00
Zuhayr
659f722b1d
Fixes drone regeneration of materials issue.
2014-05-12 03:08:43 -04:00
Zuhayr
084004049a
Fixes 'resource depleted' error for emagged drones.
2014-05-12 03:08:32 -04:00
Zuhayr
50873adbf8
Fixes the decompiler. Adds spiderlings, broken globes, mice and lizards as valid targets.
...
Conflicts:
code/modules/mob/living/silicon/robot/drone/drone_items.dm
2014-05-12 03:08:12 -04:00
Zuhayr
2e545095f7
Readds drone held icon that got lost somewhere in merges.
...
Conflicts:
icons/obj/objects.dmi
2014-05-12 03:05:41 -04:00
Zuhayr
8914cdb2ba
Double whoops.
2014-05-12 03:03:48 -04:00
Zuhayr
450beac5a9
Fixes a runtime with drones building lights.
2014-05-12 03:03:37 -04:00
Zuhayr
57e2ff481f
Whoops.
2014-05-12 03:03:25 -04:00
Zuhayr
8f9841d349
Removed a redundant line.
2014-05-12 03:03:15 -04:00
Zuhayr
097f903ba3
Added toggle verb for drones.
...
Conflicts:
code/modules/admin/admin_verbs.dm
2014-05-12 03:03:01 -04:00
Zuhayr
b70337918c
Join As Drone and drone rebooting will now check cyborg jobbans.
2014-05-12 03:00:52 -04:00
Zuhayr
1af09fbfba
Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.
...
Conflicts:
baystation12.dme
code/game/objects/items/stacks/sheets/sheet_types.dm
code/modules/projectiles/guns/projectile/bow.dm
icons/obj/gun.dmi
2014-05-12 02:59:53 -04:00
ZomgPonies
7c843665a0
Compile fix
2014-05-12 02:52:56 -04:00
Ccomp5950
fd23f7f7ba
Re-adds Show Player Panel right click menu on players.
...
Conflicts:
code/modules/admin/admin_verbs.dm
2014-05-12 02:19:51 -04:00
Zuhayr
d606d774d8
Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.
...
Conflicts:
baystation12.dme
code/controllers/configuration.dm
code/game/objects/items/weapons/AI_modules.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/robot/examine.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
code/modules/recycling/disposal.dm
icons/mob/robots.dmi
icons/obj/device.dmi
2014-05-12 01:41:02 -04:00
ZomgPonies
c6d481f00a
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-05-12 01:11:48 -04:00
ZomgPonies
81d29c4409
Merge pull request #196 from Regen1/master
...
Rebalanced some rigs + SM typo fix
2014-05-12 01:10:19 -04:00
SamCroswell
c4d7c91e76
Map Bugfixes, some past due Ninja changes
2014-05-10 22:25:58 -04:00
Regen
6dc8e2a497
Forgot latest sec rig changes
2014-05-10 18:18:54 +02:00
Regen
28fd207c80
Rebalanced some rigs + SM typo fix
...
Cause Engineers needs to die faster.
Normal hardsuits + atmos now have 30 melee resistance instead of 40 and
bomb reduced to 20 from 35
CE hardsuit remains at 40 melee, but has bomb reduced to 25
Sec hardsuits melee lowered from 50 to 40 but gets a boost to energy
from 5 to 15
2014-05-10 18:15:25 +02:00
ZomgPonies
d5502ca62e
Should fix dead embryos being spawnable maybe?
2014-05-08 02:43:37 -04:00
ZomgPonies
b23f90b10a
Feed and Facehug no longer use a menu and instead pick a random target in range.
2014-05-07 21:43:17 -04:00
ZomgPonies
48f00ee263
Revert "Thermite Effectiveness Scaling with Volume"
...
This reverts commit 9a66fd7edd
2014-05-07 19:54:01 -04:00
Giacomand
d147e97ca0
You can now walk behind the three top parts of the gravity generator, to be able to fix a space breach in the middle of it.
...
Conflicts:
code/modules/power/gravitygenerator.dm
2014-05-07 16:18:22 -04:00
Ccomp5950
fafde6dd15
[Bugfix] Fixes partial prints.
...
Playays will now no longer leave complete prints from touching an item once.
Instead they will leave a partial print, that has a high chance of leaving more and more with each touch.
You have a 1/100 chance of leaving a full set of prints on your first touch.
Fixes #4176
2014-05-07 16:12:51 -04:00
ZomgPonies
8df4009a4b
Fixing mutantrace runtime
2014-05-07 04:32:49 -04:00
ZomgPonies
275986131f
Fixes removed chestbursters being invulnerable. They now insta-die once the surgery to remove them is complete.
2014-05-07 02:22:39 -04:00
ZomgPonies
7d73ffdebc
Final fix for slime people, also cant be absorbed by lings.
2014-05-07 02:06:10 -04:00
ZomgPonies
5ee775c649
Hopefully fixes slime people?
2014-05-07 00:27:11 -04:00
ZomgPonies
b8a70103d7
Fix soem bugs -- Immortal Facehugger and Cap laser rechargerate
2014-05-07 00:06:50 -04:00
ZomgPonies
e4642430d4
Compile fix
2014-05-06 01:19:56 -04:00
