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 |
|
MrMagolor
|
80bb221891
|
Adds an ATMOS Holofan Creator to the Chief Engineer's locker (#12419)
|
2019-09-26 16:59:20 -07:00 |
|
farie82
|
0e8ddb2afe
|
Refactors the examine proc to return a list of strings (#12280)
|
2019-09-25 22:05:01 -07:00 |
|
Fox McCloud
|
cb8529cdb8
|
Makes Xenobiology Simpler. Removes Slimes (#12398)
|
2019-09-24 16:17:33 -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 |
|
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 |
|
Kyep
|
dfd83d822a
|
Depot Fixes & Tweaks (#11677)
* Depot Fixes & Tweaks
|
2019-09-16 22:55:54 -04:00 |
|
Fox McCloud
|
d015c0c2b2
|
even-still-though-time-itself-be-shattered
|
2019-09-16 01:35:25 -04:00 |
|
Fox McCloud
|
788f1926fb
|
though-our-bodies-be-ravaged
|
2019-09-15 19:49:52 -04:00 |
|
Fox McCloud
|
af92373d33
|
though-this-world-may-be-broken
|
2019-09-15 05:53:43 -04:00 |
|
Fox McCloud
|
1bfb442d40
|
Merge remote-tracking branch 'upstream/master' into universal-damage
|
2019-09-14 21:15:31 -04:00 |
|
variableundefined
|
ee86b56d58
|
Merge pull request #12250 from Fox-McCloud/linda-upgrade-prep
Refactors Atmos Air Current Pushing
|
2019-09-11 01:28:55 -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 |
|
Fox McCloud
|
f998cb74ad
|
then-we-shall-reforge-the-armor-from-what-remains
|
2019-09-10 07:03:05 -04:00 |
|
Fox McCloud
|
42564c65f3
|
Refactors Atmos Air Current Pushing
|
2019-09-09 20:11:26 -04:00 |
|
Fox McCloud
|
d19961378d
|
first-we-burn-away-the-world-that-was
|
2019-09-09 14:48:29 -04:00 |
|
Fox McCloud
|
8587f63982
|
Refactors Spawners/Tendrils
|
2019-09-07 20:02:53 -04:00 |
|
Fox McCloud
|
0854f75f7b
|
Fixes Pugs
|
2019-09-06 19:06:41 -04:00 |
|
Fox McCloud
|
a54cac4887
|
foxes are canines
|
2019-09-05 19:18:24 -04:00 |
|
Fox McCloud
|
dca6d98f5f
|
Refactors Corgis
|
2019-09-04 18:40:34 -04:00 |
|
Fox McCloud
|
473850ff92
|
Merge remote-tracking branch 'upstream/master' into simple-mob-update
|
2019-09-02 22:32:08 -04:00 |
|
Fox McCloud
|
ca72a04023
|
Fixes Who Knows How Many Runtimes
|
2019-09-01 21:22:37 -04:00 |
|
Fox McCloud
|
86dfb4c823
|
Simple Mob Update
|
2019-08-30 20:32:08 -04:00 |
|
Fox McCloud
|
20b35033f7
|
Merge pull request #12135 from Shadow-Quill/Ooh-Ahh-Push-It
Fixes pushing necropolis tendrils
|
2019-08-29 21:03:31 -04:00 |
|
Fox McCloud
|
4716bdd272
|
Merge pull request #12053 from Couls/boxing-in-the-90s
Fix cardboard box walldash
|
2019-08-29 20:54:07 -04:00 |
|
Shadow
|
4da4257756
|
whoops, spilled my meme
|
2019-08-29 19:51:10 -05:00 |
|
variableundefined
|
549e6ee72e
|
Merge pull request #12105 from Fox-McCloud/ports-tendril-loot
Adds Book of Babel and Jacob's Ladder
|
2019-08-29 20:43:18 -04:00 |
|
Couls
|
b1dd4d5496
|
use fox's code
|
2019-08-29 20:41:12 -04:00 |
|
Shadow
|
a4b3030e4a
|
mfw I forget to anchor
|
2019-08-29 19:14:21 -05:00 |
|
Shadow
|
aab72a5d5c
|
3 big 5 me
|
2019-08-29 18:22:04 -05:00 |
|
variableundefined
|
b75db54b1f
|
Merge pull request #12015 from SteelSlayer/atmos-QoL
Atmos tech QoL & Disposal pipe tweaks
|
2019-08-28 11:14:17 -04:00 |
|
Fox McCloud
|
a413b1f007
|
Merge pull request #11994 from Markolie/slimegenocide
Improve water handling for slimes, Grey mask/head water protection tweak
|
2019-08-28 03:14:50 -04:00 |
|
Fox McCloud
|
9f2f9cfa6c
|
Merge remote-tracking branch 'upstream/master' into ports-tailoring
|
2019-08-27 18:23:11 -04:00 |
|
Fox McCloud
|
1b10495f7d
|
fix
|
2019-08-27 18:08:43 -04:00 |
|
variableundefined
|
e6a190ae72
|
Merge pull request #12093 from Fox-McCloud/sandbags-and-barricades
Adds Sandbags Reworks Security Barricades
|
2019-08-27 18:01:20 -04:00 |
|
variableundefined
|
722df75be4
|
Merge pull request #12090 from Fox-McCloud/jetpack-upgrade
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
|
2019-08-27 17:39:19 -04:00 |
|
Fox McCloud
|
a4f187ac38
|
Adds Book of Babel and Jacob's Ladder
|
2019-08-27 16:04:54 -04:00 |
|
Mark van Alphen
|
ffd73c75ec
|
Merge branch 'master' into slimegenocide
|
2019-08-27 17:40:20 +02:00 |
|
datlo
|
9ec6c795d1
|
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into add-biodomes
|
2019-08-27 11:02:49 +02:00 |
|
Fox McCloud
|
0b46603e38
|
Merge pull request #12078 from SteelSlayer/paramedic-hand-defib
Adds a handheld defibrillator to the paramedic EVA closet
|
2019-08-27 02:40:31 -04:00 |
|
Fox McCloud
|
eef0bc919d
|
Implements Tailoring
|
2019-08-26 17:41:39 -04:00 |
|
Fox McCloud
|
1befa092be
|
Adds Sandbags Reworks Security Barricades
|
2019-08-26 03:21:45 -04:00 |
|
Fox McCloud
|
899eb9c948
|
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
|
2019-08-26 00:11:42 -04:00 |
|
Fox McCloud
|
9a4834a565
|
Merge remote-tracking branch 'upstream/master' into hardsuit-helmet
|
2019-08-25 18:15:10 -04:00 |
|
variableundefined
|
8269bc525e
|
Merge pull request #11941 from farie82/examine-info
Adds tips to certain things + general fixes that for issues I across
|
2019-08-25 16:53:49 -04:00 |
|
SteelSlayer
|
e1f4a08c54
|
Adds hand defib to the paramedic EVA closet
|
2019-08-25 00:49:02 -04:00 |
|
Fox McCloud
|
cb6df7092c
|
Hardsuit Helmets Integration
|
2019-08-24 18:36:27 -04:00 |
|