Chinsky
fc76ac01e0
Nextgen lighting #2 : Lights
...
Can paint light tubes and bulbs with paint and stick in sockets to get colored lights.
2014-06-20 12:07:46 -04:00
Chinsky
3fa03af4cb
Changes paint tile coloring to use color var, less icon procs.
2014-06-20 12:07:34 -04:00
ZomgPonies
53ac0c4c79
Merge pull request #267 from Bone-White/master
...
Vox clone scanner and NO_SCAN fix
2014-06-20 10:00:42 -04:00
Bone White
61578a5880
Vox able to be cloned fix (2)
...
Minor syntax fix
2014-06-20 14:10:40 +01:00
Cael Aislinn
c23cb7afef
rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container)
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
Conflicts:
code/modules/research/xenoarchaeology/finds/finds_defines.dm
2014-06-20 08:47:51 -04:00
Cael Aislinn
5439b04241
reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
Conflicts:
code/global.dm
code/modules/mining/mine_turfs.dm
code/modules/research/xenoarchaeology/misc.dm
2014-06-20 08:13:42 -04:00
ZomgPonies
29a21e5c6f
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-06-20 08:09:05 -04:00
mwerezak
3f6b32b15b
Fixes #5186
2014-06-20 08:05:09 -04:00
Bone White
c533429c94
Vox able to be cloned fix
...
Should make the dna scanner not scan vox dna (or anything with the
NO_SCAN flag).
2014-06-20 12:55:16 +01:00
ZomgPonies
c322842381
Merge pull request #265 from Regen1/Small-fixes
...
Small fixes
2014-06-20 07:50:11 -04:00
Regen
cb45350027
More brits
2014-06-20 13:46:49 +02:00
Regen
20f410f86e
Fixed brits being bad at coding
2014-06-20 13:43:30 +02:00
ZomgPonies
a5c68a80c3
Fixing +MOD permissions and awho
2014-06-20 05:08:51 -04:00
mwerezak
175c48240d
Makes the supply shuttle process in a tighter loop
...
Conflicts:
code/game/supplyshuttle.dm
2014-06-19 09:54:45 -04:00
mwerezak
723979115c
Renames supply controller global var
...
Renamed from 'supply_shuttle' to 'supply_controller'
Conflicts:
code/controllers/verbs.dm
code/game/gamemodes/gameticker.dm
code/game/supplyshuttle.dm
2014-06-19 09:52:35 -04:00
mwerezak
bc2fa7940a
Adds supply shuttle datum
2014-06-19 09:40:28 -04:00
ZomgPonies
5cd6acc420
Merge pull request #263 from Bone-White/master
...
Stasis Bag lock added
2014-06-18 22:43:13 -04:00
Boop
f4cf6b3a0d
Fix latex gloves box not having the right sprite
2014-06-18 22:15:34 -04:00
Bone White
38655f81da
Stasis Bag lock added
...
Can be locked/unlocked by medical access. Unlocked by default when
closed.
2014-06-18 16:20:31 +01:00
ZomgPonies
384992c9fc
Merge pull request #252 from Regen1/Combat-borgs
...
Combat borgs + various tweaks
2014-06-18 06:01:46 -04:00
Jarcolr
2ae3dd0746
Adds paths for therapy dolls
...
http://puu.sh/9xlQu/53016923a6.dmi for the dolls that are already in the
code but unused.
Conflicts:
code/game/objects/items/toys.dm
2014-06-18 00:08:33 -04:00
Chinsky
5113c03c76
ixes #5075
...
Mech fabricator redefined check access for no reason, let base proc handle it.
Adds span classes for messages guestpass console gives.
2014-06-18 00:01:00 -04:00
Necaladun
6c850d406c
Disability deactivation messages
...
4 pony <3 neca
2014-06-18 12:16:09 +09:30
ZomgPonies
8057001497
Merge pull request #258 from Bone-White/master
...
Shock Glove fix, surgery table construction.
2014-06-17 22:45:32 -04:00
alex-gh
8f66499931
Blob reagents rebalance.
...
Blob mobs now spawn a FUN reagent mix on death instead of blob spores.
2014-06-18 02:27:36 +02:00
alex-gh
b8494c2822
Merge pull request #257 from alex-gh/mutiny_pinpointer
...
Fixed Mutiny pinpointers disappearing from cargo lists
2014-06-17 18:26:45 +02:00
alex-gh
5a6ccf0d9d
Fixed Mutiny pinpointers disappearing from cargo lists
2014-06-17 18:24:13 +02:00
Bone White
c353e263f4
Surgery table now constructed from plasteel x 5
2014-06-17 16:13:01 +01:00
ZomgPonies
1132879810
Fixed up the stupid handcuff shit that's been bugging me forever.
2014-06-17 10:26:04 -04:00
ZomgPonies
22fa2cd3c4
Merge pull request #256 from Bone-White/master
...
Space Law book link fix
2014-06-17 07:54:38 -04:00
mwerezak
6ada0cf263
Adds sharp and edge flags to appropriate items
...
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
Conflicts:
code/modules/research/xenoarchaeology/finds/finds_misc.dm
2014-06-17 07:08:25 -04:00
mwerezak
4a2993b20b
Separates the sharp flag into edge and sharp
...
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
Conflicts:
code/__HELPERS/unsorted.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/component.dm
code/modules/mob/living/simple_animal/bees.dm
code/modules/projectiles/gun.dm
code/modules/reagents/reagent_containers/syringes.dm
code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
ZomgPonies
86a4274a3f
add_logs runtime fix
2014-06-17 04:19:41 -04:00
ZomgPonies
bd346bca9a
Bleh
2014-06-17 04:04:57 -04:00
ZomgPonies
c0f997a022
Fix science shuttle and white windows galore.
2014-06-17 03:44:15 -04:00
Rockdtben
b5f20138f9
Security Console now uses the Player Panel New search.
...
Conflicts:
code/game/machinery/computer/security.dm
2014-06-17 02:20:26 -04:00
Miauw
01ee4f0ce9
Removes random chance from code words and makes them a bit more noticeable.
...
Conflicts:
code/game/gamemodes/traitor/traitor.dm
2014-06-17 02:17:32 -04:00
ikarrus
5c8863c364
Removes "Enter Exosuit" verb
...
Mechs can be entered with click-drags now.
Conflicts:
code/game/mecha/mecha.dm
2014-06-17 01:36:27 -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
ZomgPonies
88920b7235
Runtime fix / removing extra testing messages
2014-06-17 00:16:59 -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
2263375b10
Revert "Optimize the fuck out of using checks in machines."
...
This reverts commit 5649e2c34d
2014-06-16 22:03:34 -04:00
ZomgPonies
128e1ba386
Revert "Fix safe...?"
...
This reverts commit 0762e137ab
2014-06-16 22:03:03 -04:00
ZomgPonies
e63d79ec5c
Revert "Fixes the vending machine bug?"
...
This reverts commit 63cd212008
2014-06-16 22:01:15 -04:00
Regen
ec9210da7e
Updating PR again
2014-06-17 02:48:28 +02:00
Bone White
619cf8899d
Space Law book link fix
...
Fixed the link in the Space Law book to correctly link to the printable
version of the space law page on the wiki. Note that it uses Space_law
and not Space_Law on the wiki, as the font is smaller, but there are
some formatting errors on that page. I can't edit the wiki page
directly to fix this because it's protected, but I wanted to keep the
smaller font to make it easier to read in game.
2014-06-16 14:04:17 +01:00
ZomgPonies
a8b9634aa7
Fix Brig Physician headset
2014-06-16 00:04:53 -04:00
ZomgPonies
8fbef00f35
Woopsies
2014-06-15 23:52:44 -04:00
ZomgPonies
ed36dbd6d9
2 new karma jobs -- Brig Physician and Magistrate
2014-06-15 23:40:47 -04:00
