Mark Aherne
992ceecd4e
NanoUI updates.
...
* Map gen verb is now limited to those with server access.
* Added Z layer support.
Conflicts:
code/modules/admin/admin_verbs.dm
nano/images/nanomap.png
2014-07-21 18:54:19 -04:00
ZomgPonies
4b98dc1ff4
Xeno nerf
2014-07-21 10:08:02 -04:00
ZomgPonies
8b703f55af
Made wizard spells into various subtypes
2014-07-21 09:40:42 -04:00
ZomgPonies
d55450b8ee
Merge pull request #310 from IcyV/testing
...
Reverts hyperzine to its previous state, keep its addictivness.
2014-07-21 07:09:57 -04:00
Walter0o
bf61a0b593
removes second sleeping notification
2014-07-21 06:21:13 -04:00
IcyV
6198d9e9d9
Reverts hyperzine to its previous state, keep its addictivness
...
Revert "Made hyperzine same color as salt, because HAHA"
This reverts commit b23b5b62d9489cdf00964b94406efbd6702496f91cb87e07cf
2014-07-21 03:15:14 -07:00
Zuhayr
7c07240ac9
Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.
...
Conflicts:
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/alien.dm
code/modules/projectiles/guns/projectile/crossbow.dm
code/modules/projectiles/guns/projectile/pneumatic.dm
icons/mob/back.dmi
maps/tgstation2.dmm
2014-07-21 06:10:45 -04:00
ZomgPonies
5919243efd
Compile fix
2014-07-20 06:03:32 -04:00
Walter0o
238c198def
fixes simple_animals using FEA instead of ZAS
...
i can't believe after all this time animals still use FEA instead of ZAS.
this should fix the "random" animal deaths.
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2014-07-20 05:58:01 -04:00
Walter0o
06fa834c29
blocks hallucination on clientless mobs
...
why bother calculating all those things for clientless mobs ?
2014-07-20 05:54:52 -04:00
Walter0o
adef8d0f06
streamlining dreams
...
no calling by clientless mobs, this should save several thousand wasted calls.
turning the massive string list that would be defined each call into a global list.
the chance the same dream gets picked twice is negletable.
Conflicts:
code/modules/flufftext/Dreaming.dm
2014-07-20 05:54:37 -04:00
ZomgPonies
4e1d24609f
Fireball explosion fixes
2014-07-20 04:31:32 -04:00
ZomgPonies
c5785ee171
Re-add borers to potential random events
2014-07-20 02:26:42 -04:00
Walter0o
1bf157d4cc
borer detatch fixes
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
2014-07-20 02:20:16 -04:00
Walter0o
503cffaf96
borer detatch fixes
2014-07-20 02:14:14 -04:00
Walter0o
5c264d9ae3
fixes borer infest and detatch
...
Conflicts:
code/modules/mob/living/simple_animal/borer.dm
2014-07-20 02:13:58 -04:00
ZomgPonies
64554340f4
Modifed faction system to use a list instead. Mobs can belong to multiple factions at once.
2014-07-19 13:26:55 -04:00
ZomgPonies
e2a9e93a59
Revert "Use IconProcs lib ReadRGB instead of another same functionality proc."
...
This reverts commit 11f1d82c65
2014-07-19 11:43:48 -04:00
ESwordTheCat
11f1d82c65
Use IconProcs lib ReadRGB instead of another same functionality proc.
...
Conflicts:
code/modules/reagents/Chemistry-Colours.dm
2014-07-19 11:19:52 -04:00
ZomgPonies
ac68d0799d
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-07-19 10:52:33 -04:00
Mark Aherne
9a62de164d
Update NanoUI Live Map.
...
* Simplified how items are positioned on the map (e.g. ((value.x - 1) * 8) is now just value.x, scaling is applied later).
* Added four zoom levels (x1.0 to x2.5, triggered by links in the template).
* Moved the "Generate NanoUI Map" into the Server tab, to prevent it being used by admins accidentally.
Conflicts:
nano/images/nanomap.png
2014-07-19 10:51:01 -04:00
ZomgPonies
5d58322b0a
Merge pull request #305 from SamCroswell/master
...
Added new eye-replacement glasses
2014-07-19 10:40:40 -04:00
SamCroswell
72f4607fad
Added new eye-replacement glasses
...
These aren't intended for everyday use, I plan to incorporate them into
future events.
2014-07-19 02:17:20 -04:00
Mark Aherne
ec29e88224
Added a station map to NanoUI, this map can be used by any NanoUI to display live/dynamic elements on a map.
...
The map functionality has been added to the crew monitor console to show active crew trackers, this is working but needs refinement (icons etc.).
Conflicts:
code/modules/nano/nanoui.dm
2014-07-19 02:11:44 -04:00
Loganbacca
4dd5368c01
Fixed resisting out of lockers
2014-07-18 17:54:42 -04:00
Loganbacca
2fd4774d01
Fix resisting out of closets
...
- Removed do_after proc since it was hanging somewhere
2014-07-18 17:54:31 -04:00
ZomgPonies
60b0659d43
Made update_power be at mob level since spells are at that level.
2014-07-18 12:11:13 -04:00
ZomgPonies
9148e4b4a9
Removing more deprecated virus1 shit
2014-07-18 11:41:46 -04:00
Zuhayr
0ddab372bf
Added glass to the engineering module.
2014-07-18 07:38:30 -04:00
Zuhayr
3098c80f9c
Fixed some bugs, did some testing, moved some procs around for robot functionality.
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2014-07-18 07:38:11 -04:00
ZomgPonies
ff2557eb91
Compile fix
2014-07-18 07:35:22 -04:00
Zuhayr
0436cd3e48
Added paperwork handler, clerical gripper, some other tweaks.
...
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 07:34:12 -04:00
Zuhayr
8ae76446b7
Temp commit with robot module work
...
Conflicts:
icons/mob/head.dmi
2014-07-18 07:32:09 -04:00
Zuhayr
bdfc7ef719
Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules.
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 07:30:54 -04:00
mwerezak
6a3b19a540
Infections raise temperature faster wrt germ_level
2014-07-18 06:59:37 -04:00
Walter0o
dbc621e7ab
another missing battery check
2014-07-18 06:53:11 -04:00
Walter0o
8e9b1b1b95
missing power check
...
people could still use this without any charge
2014-07-18 06:52:55 -04:00
Chinsky
ab8b3d25c4
Possible fix for #5645
...
I think issue is that harvester won't forget what artifact it is using until harvesting process is started.
2014-07-18 06:52:40 -04:00
Chinsky
dbeb254062
Fixes #5650
...
Fixes #5649
Removed that mundane objects check as I couldn't think of why would that even be a thing.
2014-07-18 06:52:28 -04:00
Chinsky
5b1257ddb9
Fixes #5648
...
Now scanner will just give warning if clicked too fast, instead of giving obsolete data.
Also moved code from New() to initalize(), since it depends on all things already being there and a master controller existing.
Conflicts:
code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
2014-07-18 06:51:59 -04:00
Chinsky
95970f8cad
Fixes #5647 Fixes #5646
2014-07-18 06:50:57 -04:00
Zuhayr
5a8aada05d
Fixes bug with drone Bump() check
...
They can now use teleporters, hand tele portals and the disposals chute.
2014-07-18 06:49:42 -04:00
Rob Nelson
f7b516a5ab
Shit catches on fire now
...
Conflicts:
code/ZAS/Fire.dm
code/game/objects/items/weapons/storage/bible.dm
code/game/objects/items/weapons/storage/boxes.dm
code/modules/mob/living/living_defines.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photography.dm
code/setup.dm
2014-07-18 06:32:15 -04:00
Rob Nelson
08813d45cc
Fix potential ready-dna problems.
...
Conflicts:
code/game/machinery/cloning.dm
code/modules/projectiles/projectile/change.dm
2014-07-18 06:18:12 -04:00
Rob Nelson
8fbfd7ccd1
Ready_DNA not called in human new() when humans are spawned.
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2014-07-18 06:13:10 -04:00
ZomgPonies
4bfa67e053
Clown wizard gear.
2014-07-18 06:10:59 -04:00
ZomgPonies
4ad8b741a2
Turned remote talk into a spell and optimized it, giving it it's action button
2014-07-18 02:38:53 -04:00
VampyrBytes
b3f396bfff
Fixes inventory bug
...
Fixes the bug where you couldn't interact with someone's inventory when
they were on top of a structure, such as a table
2014-07-17 05:48:59 +01:00
ZomgPonies
9b145f3da2
Merge pull request #299 from VampyrBytes/master
...
Fix for internal organ surgery
2014-07-17 15:58:20 -04:00
ZomgPonies
58803b7b83
New positive random event, yay
2014-07-17 15:28:09 -04:00
