Fox McCloud
affa319fab
Removes Console Screens ( #12512 )
2019-10-08 21:07:50 -04:00
variableundefined
3ae71f7932
Merge pull request #12245 from Fox-McCloud/universal-damage
...
Universal Object Damage
2019-10-06 23:22:48 -04:00
Fox McCloud
67dc33ac3f
for-the-strength-from-which-he-gives-is-unerring
2019-10-05 02:08:11 -04:00
Fox McCloud
20c4cf0a08
for-if-I-stand-I-stand-by-his-will-alone
2019-10-03 19:52:03 -04:00
Fox McCloud
d29be05f74
the-figment-that-was-is-now-gone
2019-10-01 19:08:15 -04:00
Fox McCloud
a97d050f4b
Syringe Refactor. Overhauls Lethal Injection Syringe
2019-09-30 18:25:36 -04:00
Fox McCloud
a469d0fcf2
for-God-has-redeemed-us-all
2019-09-30 16:49:15 -04:00
Fox McCloud
9097dfcacf
Merge remote-tracking branch 'upstream/master' into universal-damage
...
# Conflicts:
# code/game/machinery/machinery.dm
# code/game/objects/items.dm
# code/game/objects/structures.dm
# code/game/objects/structures/inflatable.dm
# code/game/objects/structures/mirror.dm
# code/modules/clothing/spacesuits/hardsuit.dm
# code/modules/clothing/suits/wiz_robe.dm
# code/modules/mob/living/carbon/alien/alien_defense.dm
# code/modules/mob/living/carbon/slime/slime.dm
# code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
farie82
0e8ddb2afe
Refactors the examine proc to return a list of strings ( #12280 )
2019-09-25 22:05:01 -07:00
Fox McCloud
3f143c071c
Fixes Seed Vault Gene Modder ( #12409 )
2019-09-24 15:23:54 -07:00
AzuleUtama
2855248818
Fixes durathread mutating, reorganizes seed vendor ( #12401 )
2019-09-24 15:19:45 -07:00
Fox McCloud
86e6d85093
Nutrition Refactor ( #12389 )
2019-09-24 15:17:55 -07:00
Fox McCloud
62226851d9
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-23 12:53:52 -04:00
Fox McCloud
c87389a595
TG Buckle Update ( #12375 )
2019-09-22 18:22:57 -07:00
MarsM0nd
7c2abe9cdf
Fixes nettle pickup ( #12371 )
2019-09-21 12:18:36 -07:00
Fox McCloud
238ea19d09
Merge remote-tracking branch 'upstream/master' into universal-damage
...
# Conflicts:
# code/modules/clothing/suits/labcoat.dm
# code/modules/clothing/under/miscellaneous.dm
# code/modules/mob/living/carbon/human/species/golem.dm
# code/modules/mob/living/simple_animal/bot/ed209bot.dm
2019-09-21 12:40:07 -04:00
Fox McCloud
d5759a0db5
Rebalances Golems, Refactors Species Based Equipping ( #12358 )
2019-09-21 06:10:37 -07:00
Fox McCloud
aa49033844
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
Fox McCloud
af92373d33
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
Fox McCloud
91d08fb1f6
garlic reagent
2019-09-11 06:33:03 -04:00
Fox McCloud
5e4521bc82
Hydroponics Update: Growable Ash Flora
2019-09-11 05:52:57 -04:00
Fox McCloud
a81b52f834
Merge remote-tracking branch 'upstream/master' into ashwalker-tweak
2019-09-03 01:16:36 -04:00
Fox McCloud
94cd248b20
Fixes Some Null Tastes and Fruit Wine
2019-09-01 18:59:13 -04:00
Fox McCloud
34683b5744
Ashwalker Map Tweaks--Wooden Tools
2019-08-31 21:21:58 -04:00
variableundefined
3dca5d09ec
Code styling + Vitamin
2019-08-31 20:00:52 -04:00
variableundefined
a5c0138dda
Deconflict and revert an accidental iconstate name change
2019-08-31 09:18:36 -04:00
Fox McCloud
9f2f9cfa6c
Merge remote-tracking branch 'upstream/master' into ports-tailoring
2019-08-27 18:23:11 -04:00
variableundefined
b488d9d27e
Merge pull request #11989 from Fox-McCloud/diona-refactor
...
Diona Rework
2019-08-27 18:03:47 -04:00
variableundefined
83751e8e74
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into TasteOfVictory
2019-08-27 15:20:23 -04:00
Fox McCloud
eef0bc919d
Implements Tailoring
2019-08-26 17:41:39 -04:00
variableundefined
1dc8e66cbc
Merge pull request #11772 from Couls/constructable-rechargers
...
[READY] Constructable Rechargers and machinery tweaks
2019-08-23 09:16:37 -04:00
Fox McCloud
3667557b60
More Lavaland Updates: Primal and Bayonets
2019-08-19 20:02:53 -04:00
Fox McCloud
0189cd1dee
Diona Rework
2019-08-12 01:51:29 -04:00
Mark van Alphen
14e8022daf
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
...
# Conflicts:
# code/game/objects/effects/step_triggers.dm
2019-08-09 23:38:49 +02:00
Couls
268881de5c
Merge remote-tracking branch 'upstream/master' into constructable-rechargers
2019-08-04 21:11:21 -04:00
variableundefined
d3f6886433
Hydroponic, food and reagent taste mult
2019-08-05 00:08:49 +08:00
variableundefined
f4c8678892
Hydroponic Stage 1
2019-08-04 10:37:18 +08:00
variableundefined
eeb86a0d2f
Stage 1 Functional Code Only
2019-07-30 20:38:03 +08:00
Mark van Alphen
fd579015b1
Portal fixes - adds oldloc to Crossed()
2019-07-15 20:16:17 +02:00
Kyep
ac5ab6b3db
fixes bug with biogenerator
2019-07-04 12:41:39 -07:00
Couls
cf31a774a5
Rechargers can be built now
...
Rechargers now use capacitors as their stock parts and recharge faster depending on the quality of the recharger(may need balancing)
Can now also place smaller machinery on tables by clicking on the table while pulling them(microwaves and soda dispensers are some examples)
2019-07-01 01:19:17 -04:00
Mark van Alphen
ba0f6abb02
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/game/objects/items.dm
# code/modules/power/cable.dm
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
# icons/obj/lighting.dmi
# paradise.dme
2019-04-30 19:26:17 +02:00
variableundefined
56977dc052
Merge pull request #11376 from Arkatos1/Cardboard
...
Cardboard can now be made in the Biogenerator
2019-04-29 23:08:16 +08:00
Mark van Alphen
4423962a2a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/controllers/subsystem/mapping.dm
# paradise.dme
2019-04-26 23:07:57 +02:00
Arkatos1
85cb74bec5
Cardboard can now be made in the Biogenerator
2019-04-25 12:27:32 +02:00
Fox McCloud
0034e851a1
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
Mark van Alphen
c878f8e36e
Lavaland code review fixes - also integrates flyswatter and cat toy
2019-04-20 00:24:58 +02:00
Mark van Alphen
6faf9c769f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/modules/mob/living/simple_animal/friendly/farm_animals.dm
# paradise.dme
2019-04-17 22:46:43 +02:00
Fox McCloud
58a7107eae
shocking animals
2019-04-12 16:03:18 -04:00
Fox McCloud
90c9f3f479
Refacors Electrocution
2019-04-10 18:09:14 -04:00
