cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,275 Commits 26 Branches 2 Tags
0119d350b4ab095df434b4e7977853c032a2fbb0
Commit Graph

1853 Commits

Author SHA1 Message Date
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
Fox McCloud
9b9d5461ef Re-organizes Lavaland Files; Makes some Balacne tweaks 2019-08-24 03:58:05 -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
Couls
8715878a67 Fix cardboard box walldash 2019-08-22 16:51:07 -04:00
Fox McCloud
052ee02db4 Merge pull request #12002 from Markolie/falsewallfix 
False wall secure fix, add extra step to plating deconstruction
 2019-08-21 01:31:21 -04:00
datlo
28caad13f9 add winter/clown biodomes 2019-08-18 21:06:58 +02:00
SteelSlayer
e0a34a179b Adds destination tagger to atmos locker 2019-08-17 13:07:35 -04:00
variableundefined
f82adc1310 Merge pull request #11937 from farie82/Borgs-crate-rig-fix 
Rigging a crate now costs 15 coils instead of deleting your stack
 2019-08-16 00:33:20 +08:00
farie82
00d7eb7c3f Update crates.dm 2019-08-15 18:16:50 +02:00
variableundefined
34bb102a37 Merge pull request #11767 from Arkatos1/pillbottle 
New Medical Directive - Colored Pillbottles!
 2019-08-15 11:17:46 +08:00
variableundefined
9945c04f96 Merge pull request #11833 from dovydas12345/Chair 
Fixes being able to pick up chairs with full hands or without hands.
 2019-08-14 23:47:12 +08:00
Mark van Alphen
df2df63b5f False wall secure fix, add extra step to plating deconstruction 2019-08-14 04:13:47 +02:00
Couls
7c5bdcc83c Merge remote-tracking branch 'upstream/master' into unrestricted-airlocks 2019-08-13 21:46:32 -04:00
Mark van Alphen
d1ad6aad45 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into slimegenocide 
# Conflicts:
#	code/__DEFINES/misc.dm
 2019-08-13 02:32:53 +02:00
Mark van Alphen
521e81e8d2 Improve water handling for slimes, Grey mask/head water protection tweak 2019-08-13 02:26:59 +02:00
Arkatos1
bddc7132c2 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-08-12 16:36:43 +02:00
variableundefined
f6505a6fd5 Merge pull request #11819 from Kyep/medals 
Department Medals
 2019-08-12 17:52:22 +08:00
variableundefined
9eff8a8663 Merge pull request #11696 from Markolie/shuttlechairs 
Add shuttle chairs (and fix newlines on all maps)
 2019-08-11 16:32:14 +08:00
Mark van Alphen
2ae1fc7ac2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs 
# Conflicts:
#	icons/obj/chairs.dmi
 2019-08-09 23:41:07 +02: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
farie82
b4ed42155b return 2019-08-07 08:43:32 +02:00