Fox-McCloud
56f0d79f15
Adds Species Levers
2017-01-14 03:51:43 -05:00
Fox-McCloud
8e355a867c
Fixing Food Runtime
2017-01-10 21:40:54 -05:00
Crazy Lemon
f1c3a7cd13
Merge pull request #6085 from Fox-McCloud/food-rework
...
Food rework
2017-01-10 12:11:17 -08:00
Crazylemon64
ec0f13d41e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2017-01-06 05:01:43 -08:00
Crazylemon64
f954382619
Adds a ui_key arg to ui_data
2016-12-31 12:51:07 -08: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
Crazy Lemon
cf2f02e2c6
Merge pull request #5985 from Fox-McCloud/wall-rot
...
Wall Rot Effect Refactor
2016-12-21 17:43:45 -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
Fox-McCloud
4b1bfe33ff
Wall Rot Effect Refactor
2016-12-14 13:12:10 -05:00
Fox-McCloud
7a55ec18fc
Merge remote-tracking branch 'upstream/master' into food-rework
2016-12-05 12:40:32 -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
f53b38da3d
nutrition adjustments
2016-11-29 12:01:59 -05:00
Fox-McCloud
e134100164
Hunger Rework
2016-11-28 13:17:46 -05:00
Fox-McCloud
ed3a5252c8
Fixes Faint and Mickey Finn
2016-11-26 16:09:00 -05:00
Aurorablade
21781d7be8
Crazy lemon comments.
2016-11-22 02:22:39 -05:00
Fox-McCloud
feecce9d2e
OOP blacklist
2016-11-10 21:59:19 -05:00
Fox-McCloud
954e7b3c5d
more cleanup
2016-11-10 06:28:28 -05:00
Fox-McCloud
d809645f18
proc fix
2016-11-09 22:44:15 -05:00
Fox-McCloud
14e2eb8eb0
consumables
2016-11-08 10:26:29 -05:00
Fox-McCloud
b1b78ec3ee
nutrition fix
2016-11-08 06:48:24 -05:00
Fox-McCloud
46887e88d8
fixes
2016-11-08 06:41:48 -05:00
Fox-McCloud
36e84ccdf7
further structure
2016-11-06 15:02:25 -05:00
Fox-McCloud
61da53cca1
create reagents proc
2016-11-06 14:37:47 -05:00
Fox-McCloud
77c6460bfe
drinking glass refactor
2016-11-06 02:02:08 -05:00
Fox-McCloud
710e0e1005
oops
2016-11-04 14:38:18 -04:00
Fox-McCloud
0cfcfb4c32
repathing
2016-11-04 14:26:50 -04:00
Fox-McCloud
ebb59ca511
Reagent Reorganization
2016-11-03 21:27:10 -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
Fox-McCloud
4b81269adc
reagents
2016-10-25 04:14:39 -04:00
Crazylemon64
6a7f7394a8
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
TheDZD
20078cbb48
Merge pull request #5755 from Fox-McCloud/loading-fixes
...
Fixes Dual Location Objects with Grinder and Biogenerator
2016-10-10 20:18:24 -04:00
Fox-McCloud
f7f1e493ed
Fixes Dual Location Objects with Grinder and Biogenerator
2016-10-09 14:04:52 -04:00
KasparoVy
ffc0083098
bottlefix
2016-09-18 01:06:47 -04:00
Krausus
b0ac462166
Integrates UIDs into View Variables
2016-09-08 19:04:50 -04:00
Krausus
d146de1dd7
UID mass replace: src=\ref[datum]
2016-09-05 23:12:08 -04:00
Krausus
92405288d2
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
IcyV
a015a11254
Buckets can be worn as hats
...
Allows for buckets to be worn as a hat. Déjà vu.
Sprite by FullOfSkittles
🆑 IcyV
add: Buckets can be worn as hats.
/🆑
2016-09-04 07:52:11 -07:00
Fox McCloud
4eb1aff523
Merge pull request #5551 from IcyV/BottleFixes
...
Makes bottles not as terrible
2016-09-03 13:24:40 -04:00
KasparoVy
6f1b3bce2f
Aligns the reagent bottles as they used to be, corrects an issue with filler image and the base bottle icon_state.
2016-09-02 02:10:52 -04:00
TheDZD
f5577b4a8f
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
KasparoVy
0b77f70ef0
Fixes a couple bugs, resolves some issues, re-adds a few more bottle choices.
2016-08-27 23:42:31 -04:00
KasparoVy
4481caa39b
Switching to underlays.
2016-08-27 21:38:26 -04:00
IcyV
be223511b9
A few more tweaks and updates.
...
Most of this can be attributed to KasparoVv
2016-08-27 07:46:39 -07:00
KasparoVy
6efd9efdfe
bottle filler icon handling and nanoui fixes
2016-08-27 04:02:11 -04:00
IcyV
a2af7ac8ab
Makes bottles not as terrible
...
Previously, the brown rbottles found in chemical lockers were stuck as
brown forever. Now they actually display the chemical inside of them.
The bottles for items such as morphine or toxins that you could get from
vendors always had a specific bottle that never updated based on
chemical or volume. These have new bottles and properly work now.
Much thanks to FullOfSkittles for the bottle sprite and KasproVv for
pretty much most of getting this worked out.
🆑 IcyV
add: Adds new bottle sprite
fix: Fixes many bottles being locked to a single icon
/🆑
2016-08-26 03:51:55 -07:00
Fox-McCloud
f4db89eb88
full desconstruction
2016-08-21 19:56:49 -04:00
monster860
19460ff4af
Makes boldnotice and danger classes be be used
2016-08-11 12:20:02 -04:00
Tigercat2000
58103757cc
Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
...
Conflicts:
code/game/gamemodes/newobjective.dm
code/game/gamemodes/objective.dm
2016-08-10 14:16:42 -07:00
Ronald T. Mullins III
13eaf6eac6
Fix for #5386
...
Also includes mix_messages for synthignon and synth n' soda because neither of them are BLUE
2016-08-09 16:14:58 -05:00
Tigercat2000
0821e5bd04
Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
...
Conflicts:
code/game/gamemodes/objective.dm
2016-08-08 06:21:02 -07:00
