Commit Graph

7147 Commits

Author SHA1 Message Date
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.

Conflicts:
	code/game/turfs/simulated/walls.dm
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
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
Ccomp5950
db072d7f4a Adds Mentors.
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).

If the confic option for mentors is set then

	the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt

	staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.

Also:  Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.

Conflicts:
	code/game/verbs/who.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/deadsay.dm
	config/example/config.txt
2014-05-06 01:18:36 -04:00
ZomgPonies
94308a486a Mentors can use msay 2014-05-05 23:11:28 -04:00
Zuhayr
459887c70f Fixes #4421
Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/mob/living/living.dm
2014-05-05 22:56:23 -04:00
Zuhayr
1c64bb342a Fixes #3741
Conflicts:
	code/modules/mob/living/silicon/robot/component.dm
2014-05-05 22:42:32 -04:00
Zuhayr
5d662e4392 Robots will now take burn damage from appropriate projectiles, rather than recieving brute. 2014-05-05 22:39:13 -04:00
ZomgPonies
48aea00e33 Grav generator, not mapped in yet 2014-05-05 03:03:22 -04:00
ikarrus
9a66fd7edd Thermite Effectiveness Scaling with Volume
-The more thermite is applied to a wall, the faster it will burn
-Scales between approx 10-25 seconds
-Rwalls have a higher minimum threshold and burn time
-Applying thermite to a wall now leaves a visible stain on the wall

Conflicts:
	code/game/turfs/simulated/walls.dm
	icons/effects/effects.dmi
2014-05-04 22:37:44 -04:00
Ccomp5950
970525d065 Adds Mentors.
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).

If the confic option for mentors is set then

	the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt

	staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.

Also:  Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.

Conflicts:
	code/controllers/configuration.dm
	code/game/verbs/who.dm
	code/modules/admin/admin_ranks.dm
	config-example/config.txt
2014-05-04 21:37:37 -04:00
ZomgPonies
db136cc457 Fixed a savefile bug with saving skin colors for taj etc 2014-05-04 20:41:29 -04:00
MrPerson
320a06f8c9 Make sure clones don't already have a body
CASE: Guy gets backed up at genetics. Guy gets facehugged. Guy pops as a xeno. Guy gets cloned. Alium is left clientless.

Conflicts:
	code/game/machinery/cloning.dm
2014-05-04 17:06:20 -04:00
ZomgPonies
679f0fe293 Merge pull request #194 from SamCroswell/master
Nukeops Weapons Rework
2014-05-04 15:43:03 -04:00
SamCroswell
2081699e54 Bullet damage tweaks
Upped the L6's bullet damage due to how high the cost of it is. Subject
to change, as always.
2014-05-04 11:01:39 -04:00
SamCroswell
521467fa3e C4 now explodes on detonation, Stechtkin pistol fix
The Stechtkin pistol now works properly, C4 will now create a small
(Welder tank) sized explosion upon being detonated.
2014-05-04 02:28:06 -04:00
ZomgPonies
6851704c97 Fix some cases of metagaming, now you can only message/remote view humans 2014-05-03 23:45:55 -04:00
ZomgPonies
5c845658e5 Fixed some facehugger bugs 2014-05-03 23:32:17 -04:00
ESwordTheCat
532298c725 Tweak object pool system.
Conflicts:
	code/game/objects/structures/grille.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
2014-05-03 22:54:09 -04:00
iamgoofball
01a1ce1493 Fun mode re-enabled, you can now deep fry, cerealize, and etc. anything. 2014-05-03 21:16:04 -04:00
iamgoofball
424a2522b9 CIVILLIAN OVERHAUL UNO: Chef and the Kitchen
Conflicts:
	baystation12.dme
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
	icons/obj/kitchen.dmi
2014-05-03 21:15:41 -04:00
ZomgPonies
2b85081619 Merge pull request #193 from SamCroswell/master
Ninja greentext fix
2014-05-03 20:56:21 -04:00
SamCroswell
39670bf97a Ninja Greentext Fix 2014-05-03 20:52:07 -04:00
ZomgPonies
610b9b9962 Merge pull request #192 from SamCroswell/master
Map changes, new ninja masks, more commits possibly to come
2014-05-03 19:05:46 -04:00
SamCroswell
f4ef7c192b Map changes, new Ninja masks
Map changes including: RnD layout change, new customs lounge, xenoarch
windows fix, and more. Also added a few new Ninja masks in prep for some
bigger changes I have planned.
2014-05-03 18:35:10 -04:00
Zuhayr
e79097add3 Several IPC adjustments.
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-05-03 17:42:01 -04:00
Zuhayr
8986c20a4c Removed 'You are now sterile' line from groin loss due to spam issues when lost by an IPC as well as general pointlessness. 2014-05-03 17:38:13 -04:00
Zuhayr
31e95baa78 Fixes for previous commit, sigh. 2014-05-03 17:38:01 -04:00
Zuhayr
75d8633fbe Adding some repair procs to cables and welders for IPC use.
Conflicts:
	code/modules/power/cable.dm
2014-05-03 17:37:46 -04:00
Zuhayr
abcb0bc686 Lousy goddamn indentation. 2014-05-03 17:36:17 -04:00
Zuhayr
a7f0508a1e Attempting to stop IPC from eating and drinking. 2014-05-03 17:36:05 -04:00
Cael Aislinn
18e3e37507 adds new feature: cloning extinct animals and seeds from fossils found through xenoarchaeology, some minor tweaks to various other areas to make it work
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	icons/obj/hydroponics.dmi
	icons/obj/xenoarchaeology.dmi
2014-05-03 17:25:57 -04:00