cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,982 Commits 26 Branches 2 Tags
9f2f9cfa6c12d0cd460e4e5ee3eaea07bc13ac69
Commit Graph

1831 Commits

Author SHA1 Message Date
Fox McCloud
9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -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
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
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
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
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
Couls
268881de5c Merge remote-tracking branch 'upstream/master' into constructable-rechargers 2019-08-04 21:11:21 -04:00
joep van der velden
0ab00bb9ff More refactor + wrong item used fix 2019-07-29 21:18:42 +02:00
joep van der velden
ab94782f56 Fire axe code refactor + tooltip 2019-07-29 21:07:12 +02:00
joep van der velden
b46e970327 Better fix now. Use 15 wires using use() 2019-07-29 00:31:22 +02:00
joep van der velden
2bddeb7fde Borgs can't rig crates anymore with cable coil 2019-07-29 00:08:35 +02:00
Couls
5427c5267c Merge branch 'master' into unrestricted-airlocks 2019-07-15 18:29:31 -04:00
Mark van Alphen
8c8950bf07 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2019-07-15 20:37:44 +02:00
Mark van Alphen
88fa0d27df Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-15 20:30:54 +02:00
Mark van Alphen
fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Arkatos1
47b447619a Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-07-12 19:40:59 +02:00
Dovixx
404bfe3768 Update chairs.dm 2019-07-12 18:00:01 +03:00
Kyep
fd389810f2 medals in lockers 2019-07-10 20:13:14 -07:00
Mark van Alphen
d03f4dcafb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-08 19:36:30 +02:00
Couls
a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00
unknown
25f68f2e41 Removed a line that prevented Catwalks and Lattice from returning materials 2019-07-04 16:17:32 -04:00
Couls
4c0c7aa750 can now build unrestricted airlocks 2019-07-01 21:44:16 -04: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
Arkatos1
de9da04572 Standardized colors, finished change wrapper choosing and modified templates and their sizes 2019-06-30 19:46:13 +02:00
Arkatos1
16a81d2527 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-06-30 16:09:38 +02:00
Arkatos1
d33d018e62 Finished colors for other prespawned pillbottles, new colors, finished template for changing wrappers in chemmaster 2019-06-30 16:08:33 +02:00
Couls
e3a19841d9 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-22 03:54:43 -04:00
Mark van Alphen
f56854292a Add shuttle chairs (and fix newlines on all maps) 2019-06-07 03:39:24 +02:00