Commit Graph

127 Commits

Author SHA1 Message Date
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
variableundefined
71803787a8 Merge pull request #12415 from Kyep/nerf_babel 2019-10-04 14:49:26 -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
2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -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
Fox McCloud
360c29008e Minor Vehicle Refactor and Balance 2019-09-27 19:59:38 -04:00
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Kyep
4d35318766 requests 2019-09-25 16:15:21 -07:00
Kyep
2524208e83 Nerfs Book of Babel 2019-09-25 01:28:46 -07:00
Kyep
e7530e8507 Fixes hierophant club and warp cube ignoring area/tele_proof (#12360) 2019-09-24 15:16:04 -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
5810d28571 Refactors Simple Mob Creation: Adjusts Which Mobs are Available (#12325) 2019-09-17 16:06:43 -07:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud
6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
variableundefined
f6fe4a1520 Merge pull request #12291 from Fox-McCloud/hierophant-update
Hierophant Update
2019-09-14 22:31:38 -04:00
Fox McCloud
bdcdfc04f0 Hierophant Update 2019-09-13 19:35:41 -04:00
AzuleUtama
30547d2bae Fixes 'Name' design in R&D console 2019-09-13 20:12:39 +01:00
variableundefined
e571d30f74 Merge pull request #12266 from Fox-McCloud/hydro-update
Hydroponics Update: Growable Ash Flora
2019-09-12 22:40:01 -04:00
variableundefined
db211cfc54 Deconflict 2019-09-11 23:00:13 -04:00
Fox McCloud
5e4521bc82 Hydroponics Update: Growable Ash Flora 2019-09-11 05:52:57 -04:00
variableundefined
18b270cb7e Remove the structure/chair/wood/normal subtype, moving all properties to its parent. 2019-09-11 00:28:27 -04:00
variableundefined
69537dd60c Port TG hitby refactor and detonation of items by projectiles 2019-09-09 22:57:31 -04:00
Fox McCloud
8587f63982 Refactors Spawners/Tendrils 2019-09-07 20:02:53 -04:00
Fox McCloud
133795d75c more updates 2019-08-31 00:17:37 -04:00
Fox McCloud
a70084a63f makes it so you can actually get the items 2019-08-27 18:49:25 -04:00
Fox McCloud
a4f187ac38 Adds Book of Babel and Jacob's Ladder 2019-08-27 16:04:54 -04:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
Fox McCloud
9699beee82 Ports Crusher Trophies 2019-08-17 21:57:40 -04:00
Crazy Lemon
3313efed23 Merge pull request #11981 from Fox-McCloud/lavaland-update
Major Lavaland Update
2019-08-16 22:22:49 -06:00
Fox McCloud
f9c0fd2d25 fixes 2019-08-11 15:33:00 -04:00
variableundefined
b3b29b40be Merge pull request #11666 from CornMyCob/cursed-heart-fix
cursed heart fix
2019-08-11 16:34:15 +08: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
Fox McCloud
f1899f0050 Merge pull request #11697 from Markolie/tribalhealing
Add tribal splints, ash walker tweaks and Lavaland tweaks
2019-08-09 17:22:22 -04:00
Mark van Alphen
fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Mark van Alphen
6235f464fe Re-add ash flora ex_act 2019-06-08 21:23:45 +02:00
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Mark van Alphen
3381aaf287 Anchor ash flora 2019-06-06 02:16:52 +02:00
Mark van Alphen
a90b23c271 Re-apply Lava staff fix 2019-06-04 03:46:16 +02:00
Mark van Alphen
75fa225155 Remove hood from necropolis chest 2019-06-04 00:38:41 +02:00
Mark van Alphen
94eb652f15 Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix 2019-06-03 17:39:23 +02:00
CornMyCob
376c66db4d cursed heart fix 2019-06-03 16:02:45 +01:00
Mark van Alphen
8822887784 Compile fix and asteroid turf placement fix 2019-06-03 01:21:03 +02:00
Mark van Alphen
697bb8eee5 More Lavaland fixes:
- Air alarm computers will no longer display alarms that can't be remote controlled
- Survival capsules now have a NanoMed
- Fixed the disk compartmentalizer not having a sprite when something is put in
- Fixed the drying rack not having a sprite when something is put in
- Turned water bottles into glass containers so they have more functionality
- Hairless hide can now be made wet using water
- Reagents in glass containers can now be fed to others
2019-06-02 23:29:50 +02:00
Mark van Alphen
feb0a1ceec Fix explosive chance 2019-06-01 05:19:11 +02:00
Mark van Alphen
d384c42354 Fix Lavaland swarmers 2019-06-01 05:05:11 +02:00
Mark van Alphen
26a7a7a029 Lava staff fixes 2019-05-31 21:57:50 +02:00