Fox-McCloud
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
Mark van Alphen
fe62b212b4
Merge branch 'master' into lavaland_megafauna
2017-02-02 20:17:31 +01:00
Chakirski
f39fe8ab75
muh future
2017-02-01 21:29:04 -06:00
Chakirski
812c2db2fe
closets
2017-01-31 19:14:31 -06:00
Markolie
2b767bb9c9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/mob_helpers.dm
# icons/obj/ammo.dmi
# icons/obj/guns/projectile.dmi
# icons/obj/storage.dmi
2017-01-31 17:44:38 +01:00
Fox-McCloud
6fb69e272c
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-27 20:15:25 -05:00
fludd12
bb263d58c5
#JustAdminThings
2017-01-26 09:23:49 -05:00
fludd12
3cff59ec74
Adds Respawner
2017-01-26 05:09:44 -05:00
Fox-McCloud
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
Markolie
d6276ae978
Tiger's comments
2017-01-22 19:15:26 +01:00
Fox-McCloud
ea76990b7a
Botany Rework
2017-01-21 18:28:03 -05:00
Markolie
a50a3d59b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/is_helpers.dm
# code/_globalvars/lists/objects.dm
# code/game/machinery/turrets.dm
# config/example/config.txt
# goon/browserassets/css/browserOutput.css
# icons/obj/library.dmi
# icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Crazy Lemon
37a7484976
Merge pull request #6149 from FlattestGuitar/log-upgrade
...
Adds log stacking to admin logs
2017-01-18 19:13:50 -08:00
Mieszko Jędrzejczak
1b506aaf9f
Switches over to the new system
2017-01-17 13:57:07 +01:00
TullyBurnalot
a0d1f4333c
Removes needless "The"s
2017-01-12 22:17:52 +00:00
TullyBurnalot
632030daa3
Addressing request by Fox
2017-01-12 22:05:13 +00:00
TullyBurnalot
d8d5279d66
Cyborg tools not allowed in display cases
2017-01-12 21:36:19 +00:00
Markolie
0adc370d55
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/game/machinery/turrets.dm
2017-01-09 22:00:31 +01:00
Fox McCloud
8b7ce46155
Merge pull request #5959 from Markolie/fixinwall
...
False walls now block atmos
2017-01-07 14:19:53 -05:00
Fox McCloud
7de4280755
Merge pull request #6052 from Crazylemon64/morguelights
...
Morgue trays now have descriptions that correspond to their contents
2017-01-06 12:45:15 -05:00
Markolie
f4c4bfe288
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__HELPERS/unsorted.dm
# code/_globalvars/lists/objects.dm
# code/controllers/verbs.dm
# code/game/gamemodes/cult/ritual.dm
# code/game/gamemodes/cult/runes.dm
# code/game/objects/items/stacks/sheets/sheet_types.dm
# code/modules/mob/spirit/mask/mask.dm
# code/modules/mob/spirit/viewpoint.dm
# icons/effects/96x96.dmi
# icons/effects/effects.dmi
# icons/mob/actions.dmi
# icons/obj/weapons.dmi
# icons/obj/wizard.dmi
# icons/turf/floors.dmi
2017-01-06 16:36:46 +01:00
Crazylemon64
ec0f13d41e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2017-01-06 05:01:43 -08:00
Crazylemon64
27ada86bfa
Morgue trays now have descriptions that correspond to their contents
2016-12-31 21:45:07 -08:00
Crazylemon64
f954382619
Adds a ui_key arg to ui_data
2016-12-31 12:51:07 -08:00
Markolie
8609157751
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
# code/_globalvars/mapping.dm
# code/game/objects/effects/landmarks.dm
2016-12-30 00:17:56 +01:00
Aurorablade
98b7a89a17
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
...
# Conflicts:
# code/game/machinery/doors/airlock.dm
2016-12-29 11:01:43 -05:00
Aurorablade
e25ddf8329
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI
2016-12-24 00:18:40 -05:00
Markolie
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
Fox McCloud
5a01a6c7d3
Merge pull request #5840 from Crazylemon64/adds_reset_perspective
...
Polishes up `reset_view`
2016-12-23 07:27:36 -05:00
Crazylemon64
c0cd2c263f
Switches reset_view to reset_perspective
2016-12-21 17:59:08 -08:00
Crazylemon64
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
Tigercat2000
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
Markolie
3a4e26f818
False walls now block atmos
2016-12-06 22:36:22 +01:00
Aurorablade
2dc1a48f35
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-12-01 22:38:35 -05:00
Aurorablade
fa1aa894ea
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-12-01 18:04:07 -05:00
Fox McCloud
f205f5f040
Merge pull request #5915 from Twinmold93/runtime_fixer_t2
...
Spacepod and Some Runtime Fixes
2016-12-01 10:15:51 -05:00
Twinmold
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
Aurorablade
0c637cebfa
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub
2016-11-22 01:48:56 -05:00
Crazy Lemon
405fe1bb54
Merge pull request #5842 from Fox-McCloud/reagent-reorganization
...
Reagent Reorganization
2016-11-21 16:54:41 -08:00
Aurorablade
5d392b36a4
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-11-15 15:30:36 -05:00
Fox McCloud
922091d786
Merge pull request #5885 from Markolie/grammarfix
...
Grammar fix
2016-11-13 19:00:21 -05:00
Markolie
f5c9ebc068
Grammar fix
2016-11-14 00:22:24 +01:00
TullyBurnalot
1955f86383
Fax Guide Removal
...
- Removes Fax Guides from HoS and HoP Lockers
2016-11-12 01:59:21 +00:00
Aurorablade
4b717c7712
BUILDABLE cult door...
2016-11-10 02:44:21 -05:00
Fox-McCloud
61da53cca1
create reagents proc
2016-11-06 14:37:47 -05:00
Aurorablade
23e392f0ef
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-31 22:38:14 -04:00
Fox McCloud
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
Markolie
0fa43f7f41
Hopefully final magic fixes, and fixes the possessor
2016-10-25 23:32:35 +02:00
Markolie
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
Aurorablade
0a265f963c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-24 22:30:16 -04:00
