e25ddf8329
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI
2016-12-24 00:18:40 -05:00
01f2c85347
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/game/dna/genes/goon_powers.dm
# code/game/dna/genes/vg_powers.dm
# code/game/objects/effects/overlays.dm
# code/game/objects/structures/crates_lockers/closets.dm
# code/game/objects/structures/crates_lockers/closets/statue.dm
# code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
# icons/mob/back.dmi
# icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
5a01a6c7d3
Merge pull request #5840 from Crazylemon64/adds_reset_perspective
...
Polishes up `reset_view`
2016-12-23 07:27:36 -05:00
c0cd2c263f
Switches reset_view to reset_perspective
2016-12-21 17:59:08 -08:00
6d3e66f41c
Polishes up the reset_view proc, which is basically
...
`reset_perspective` from tgstation.
Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things
Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
b9abce843d
NanoUI Update: Seperate UI Data into ui_data() proc
...
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.
To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
2016-12-14 13:37:34 -08:00
3a4e26f818
False walls now block atmos
2016-12-06 22:36:22 +01:00
2dc1a48f35
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-12-01 22:38:35 -05:00
fa1aa894ea
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-12-01 18:04:07 -05:00
f205f5f040
Merge pull request #5915 from Twinmold93/runtime_fixer_t2
...
Spacepod and Some Runtime Fixes
2016-12-01 10:15:51 -05:00
ada80ec529
Pod Fixes and Some Runtime Fixes
...
Fixes sending pod pilots to the void when the pod explodes/is destroyed,
as well as giving them damage warnings, just like passengers get. Also
fixes it so if a guardian traps something, then dies, doesn't runtime.
Lastly, fixes it so there isn't a randomly runtime from opening a
critter crate, as well as cleaning up a little snowflake code, thanks to
Crazylemon.
2016-11-26 05:37:31 -06:00
0c637cebfa
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub
2016-11-22 01:48:56 -05:00
405fe1bb54
Merge pull request #5842 from Fox-McCloud/reagent-reorganization
...
Reagent Reorganization
2016-11-21 16:54:41 -08:00
5d392b36a4
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-11-15 15:30:36 -05:00
922091d786
Merge pull request #5885 from Markolie/grammarfix
...
Grammar fix
2016-11-13 19:00:21 -05:00
f5c9ebc068
Grammar fix
2016-11-14 00:22:24 +01:00
1955f86383
Fax Guide Removal
...
- Removes Fax Guides from HoS and HoP Lockers
2016-11-12 01:59:21 +00:00
4b717c7712
BUILDABLE cult door...
2016-11-10 02:44:21 -05:00
61da53cca1
create reagents proc
2016-11-06 14:37:47 -05:00
23e392f0ef
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-31 22:38:14 -04:00
911fa70e1a
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
...
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
0fa43f7f41
Hopefully final magic fixes, and fixes the possessor
2016-10-25 23:32:35 +02:00
61daab92f2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/living/carbon/human/appearance.dm
2016-10-25 18:31:39 +02:00
0a265f963c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-24 22:30:16 -04:00
e5c4b78f47
Add Colossus, add outdoors variable to areas and update fireball targeting
2016-10-25 04:10:52 +02:00
45ba4d157a
Merge pull request #5416 from KasparoVy/tail_markings_mark2
...
Marking Refactor, Adds tail markings + Alt heads + Secondary (F)Hair themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
2016-10-23 19:29:54 -04:00
6a7f7394a8
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
3acde653d2
Fix cult girder layer
2016-10-21 18:04:00 +02:00
e2ce799aa1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-08 22:21:48 -04:00
3e653a6279
Conflict resolution.
2016-09-26 12:17:35 -04:00
2b19b81b99
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-09-17 01:38:02 -04:00
c56961f6f0
Merge pull request #5642 from Krausus/UniqueIDs
...
Adds Unique Identifiers with Topic and VV Integration
2016-09-12 15:32:20 -04:00
c5e9b0514f
Redo of clown/mime door fix.
2016-09-12 20:11:54 +10:00
f1aada7ea1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-09-11 19:50:53 -04:00
92405288d2
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
1373070b98
More Conflict Resolution
2016-09-03 21:29:10 -04:00
aac3fa245d
added absolute paths
2016-09-03 09:15:30 +04:00
92fc9d79f4
removed access requirements
2016-09-02 08:24:21 +04:00
7eac0d4d8a
added mime and clown lockers to code, added sprites
2016-09-01 21:43:49 +04:00
0bfd0ae876
cultdoors
2016-09-01 01:26:59 -04:00
2c104adaf3
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-09-01 00:43:50 -04:00
f5577b4a8f
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
1c407a36a1
Sorts out some runtimes, adds randomization for a bunch more stuff in character preferences, adds species validation to undergarments, adds absolute pathing to sprite_accessories and repaths alot of stuff.
...
Also corrects some oversights.
2016-08-27 09:22:01 -04:00
b551345b73
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-08-24 20:49:20 -04:00
05ebb18b3d
Fixes a closet runtime
2016-08-22 22:14:31 -07:00
080c02af87
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-08-23 00:53:31 -04:00
ae0f60c06b
Makes girders non-bulletproof
...
Also, minor refactoring
2016-08-21 11:12:48 -04:00
47dc3a3051
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-08-16 02:23:20 -04:00
8b9b28a3c5
Fixes welded fireclosets not showing up properly
2016-08-13 13:14:30 -04:00
19460ff4af
Makes boldnotice and danger classes be be used
2016-08-11 12:20:02 -04:00
Aurorablade