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
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
mwerezak
3f6b32b15b
Fixes #5186
2014-06-20 08:05:09 -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
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
ZomgPonies
8057001497
Merge pull request #258 from Bone-White/master
...
Shock Glove fix, surgery table construction.
2014-06-17 22:45:32 -04: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
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
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
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
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
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
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
ZomgPonies
692e7ef435
Fixing biting your own hand off
2014-06-14 23:18:12 -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
f219643f96
Fixes #5195
2014-06-14 22:02:35 -04:00
ZomgPonies
386b1b8307
Fixes a bunch more hurt -> harm checks
2014-06-14 01:02:29 -04:00
ZomgPonies
fb5265d1b1
You forgot 2 commas, NOW I'm annoyed :D
2014-06-09 01:23:12 -04:00
ZomgPonies
d1f2f9c361
Merge pull request #246 from BobTheBoss64/master
...
Added volume to Zippo lighters.
2014-06-09 01:09:24 -04:00
Michael Slettevold
0a1b0af8f7
Fixed lack of Zippo volume
2014-06-08 20:20:56 -07:00
Michael Slettevold
47ec7fc3f1
Fixed lack of Zippo volume
2014-06-08 20:19:33 -07:00
Michael Slettevold
a30cd63810
Added sound effect for opening and closing Zippo lighters.
...
Corrected spelling of "independent", for flagprocs.dm.
2014-06-08 20:14:33 -07:00
ZomgPonies
32e0776b2d
Merge pull request #245 from BobTheBoss64/master
...
Zippo sound effects and spelling fixes
2014-06-08 21:56:17 -04:00
Erthilo
ee56d75f52
Bandage Typos.
2014-06-08 17:38:06 -04:00
Michael Slettevold
57eed9777c
Added sound effect for opening and closing Zippo lighters.
...
Corrected spelling of "independent", for flagprocs.dm.
2014-06-08 14:17:37 -07:00
d3athrow
a271304044
Fix a runtime that occurs from closing the Clothing menu on a human.
2014-06-08 16:24:21 -04:00
ZomgPonies
0d57c3ef4d
Tune bag choking
2014-06-06 00:06:17 -04:00
ZomgPonies
4683a12a35
Fix for storage bags
2014-06-05 22:17:01 -04:00
ZomgPonies
caaf56dbcc
Bugfix for bag choking
2014-06-05 17:09:27 -04:00
Rob Nelson
0762e137ab
Fix safe...?
...
Conflicts:
code/game/objects/objs.dm
2014-06-05 16:21:26 -04:00
Rob Nelson
5649e2c34d
Optimize the fuck out of using checks in machines.
2014-06-05 16:16:27 -04:00
ZomgPonies
b9fe3ab514
Added choking people with plastic bags.
2014-06-05 04:43:30 -04:00
mwerezak
0ed8ee9b19
Readds flashes to all robots except drones.
...
Drones also get a special low-power flashlight, now.
2014-06-03 19:22:47 -04:00
Hubblenaut
70d96aedde
Makes crashing into things possible with extinguisher or harm intent
2014-06-03 18:46:52 -04:00
Hubblenaut
2e644b845a
Adds Wheelchairs with basic driving functionality
...
Conflicts:
baystation12.dme
icons/obj/objects.dmi
2014-06-03 18:46:21 -04:00
