cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,688 Commits 26 Branches 2 Tags
7b2cc1e12bf9d86c45652dffbb4e2c0eee6fdd39
Commit Graph

2852 Commits

Author SHA1 Message Date
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
variableundefined
9097eb0e1d Merge pull request #11741 from AzuleUtama/chameleonGlasses 
Traitor thermals and security HUD now use updated chameleon code, Slight buff to the thermals
 2019-08-13 12:06:39 +08:00
variableundefined
80921a3ba4 Merge pull request #11807 from Tayyyyyyy/ert_tweaks 
Randomized ERT priority + drag and drop role selection
 2019-08-13 08:43:22 +08:00
AzuleUtama
f19e8aa58a conflicts 2019-08-12 18:47:11 +01:00
variableundefined
98b821c120 Merge pull request #11637 from datlo/lavalandgolemsintospace 
Move free golems to lavaland, let them move shuttle still
 2019-08-12 17:42:40 +08:00
Fox McCloud
940f87b210 Merge pull request #11942 from Couls/clown-buff 
Waddling component, clowns can now choose to waddle while they walk, penguins automatically waddle
 2019-08-11 20:54:04 -04:00
datlo
d329f04ae6 Merge branch 'master' into lavalandgolemsintospace 2019-08-11 16:12:28 +02:00
variableundefined
ae70cbfe41 Merge pull request #11606 from Markolie/ghostqol 
Observer/hud improvements and fixes
 2019-08-11 16:23:23 +08:00
Fox McCloud
6c8fe1d506 Merge pull request #11864 from Markolie/portalfix 
Portal fix
 2019-08-10 23:24:58 -04:00
Fox McCloud
ee0447dad6 Major Lavaland Update 2019-08-10 22:36:55 -04:00
variableundefined
c778b16e76 Merge pull request #11970 from datlo/traitorconflictfix 
Fix conflicting traitor objectives
 2019-08-10 20:27:20 +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
datlo
a408aea8f4 fix conflicting objs and double exchange docs 2019-08-08 10:30:05 +02:00
Couls
07dbf66a18 Waddling! 2019-07-29 03:16:18 -04: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
variableundefined
5c325d33fe Merge pull request #11684 from IAmBigCoat/medbeamwarnings 
Added warnings to the medbeam gun re: stream-crossing
 2019-07-12 18:17:07 +08:00
variableundefined
36736277a1 Merge pull request #11358 from Couls/diagonal-movement 
[Ready for Testmerge] Implement Diagonal Movement
 2019-07-12 17:12:57 +08:00
Couls
2d7f2bb3c2 Code cleanup, spacing fixes 2019-07-09 08:11:43 -04:00
variableundefined
74a7b7ad55 Merge pull request #11566 from Arkatos1/locked 
Action Buttons - Lockdown
 2019-07-09 18:22:40 +08:00
tayyyyyyy
bed6f9b0ef Drag and drop in ranked preferences input 2019-07-08 14:59:51 -07:00
tayyyyyyy
9d9bf046e3 Fix autocomplete input mishandling single quotes 2019-07-08 14:22:52 -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
cee64d5c37 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-08 10:13:15 -04:00
variableundefined
3fdf53b180 Merge pull request #11593 from AzuleUtama/CyberBundleFix 
Makes Cybernetic Bundles a Nukie-only item again
 2019-07-08 20:21:47 +08:00
variableundefined
fb15166fda Merge pull request #11570 from Tayyyyyyy/autocomplete 
Autocomplete input
 2019-07-08 20:21:22 +08:00
Couls
a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00
variableundefined
df199a651d Merge pull request #11663 from Markolie/maskofnarsie 
Remove traces of the Mask of Nar'Sie
 2019-07-07 22:10:02 +08:00
Couls
33d35eb625 Merge branch 'master' into diagonal-movement 2019-07-02 05:55:44 -04:00
variableundefined
a189efe72d Merge pull request #11449 from Shadeykins/AI-Laws 
Changes Quarantine, NT Default, Aggressive, and Corporate AI Lawsets [REVIEW READY].
 2019-06-30 15:15:07 +08:00
variableundefined
497601245f Merge pull request #11496 from Markolie/cultthings 
Gives the night vision spell to cult constructs
 2019-06-30 14:35:32 +08:00
AzuleUtama
9500df95d3 Traitor thermals and security HUD now use chameleon code 2019-06-22 14:06:07 +01:00
Couls
e3a19841d9 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-22 03:54:43 -04:00
datlo
8894d88a82 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into lavalandgolemsintospace 2019-06-13 13:58:56 +01:00
Improvedname
24c2b0fd4f j 2019-06-10 19:53:03 +02:00
Mark van Alphen
fea2b2532d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cultthings 
# Conflicts:
#	paradise.dme
 2019-06-09 23:28:41 +02:00
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
IAmBigCoat
f04a0a4c53 Added proposed uplink description change. 2019-06-05 17:07:09 -04:00
IAmBigCoat
8645a0b0ef Added warnings to the medbeam gun re: stream-crossing 2019-06-05 01:49:58 -04: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
Mark van Alphen
2dd6dcfb55 Remove traces of the Mask of Nar'Sie 2019-06-03 06:33:43 +02:00
Couls
5979166f54 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-02 21:59:58 -04: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
datlo
32812736ee Integrate free golems as a lavaland ruin 2019-05-31 09:30:03 +01:00
Mark van Alphen
f0734672f3 Lavaland fixes: 
- Survival pod storage being broken when used.
- Wrong wiring on the Syndicate base.
- Added one more oxygen tank to the animal hospital.
- Chasms eating up light atoms.
- Mining satchels not picking up items automatically.
- Releasing the legion/blob mice notifications not having icons.
- Mining gear made orderable at cargo.
 2019-05-31 02:21:37 +02:00
Mark van Alphen
b65fbb907e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme
 2019-05-30 19:35:52 +02:00
Mark van Alphen
f45d16f2c3 Observer/hud improvements and fixes 2019-05-27 19:59:54 +02:00
variableundefined
e8d13fec44 Merge pull request #11524 from Fox-McCloud/the-end 
The End
 2019-05-27 19:45:51 +08:00
AzuleUtama
bddc563343 Makes Cybernetic Bundles Nuke Ops Only Again 2019-05-26 02:24:44 +01:00