cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-07 08:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,828 Commits 26 Branches 2 Tags
b65fbb907ea35c693a2ef48aef656a7d043a2e77
Commit Graph

17037 Commits

Author SHA1 Message Date
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
variableundefined
86ecd0f8b0 Merge pull request #11584 from Markolie/ghastlytransition 
Re-add ghost space transitions, add ghost-z level tracking
 2019-05-28 11:28:34 +08:00
variableundefined
3acf995a76 Merge pull request #11466 from Markolie/bundles 
Species chameleon fix
 2019-05-28 10:53:17 +08:00
variableundefined
3dae8eded3 Merge pull request #11430 from Markolie/actual_bundles 
[DNM] Uplink bundle rebalance
 2019-05-27 23:05:46 +08:00
variableundefined
e8d13fec44 Merge pull request #11524 from Fox-McCloud/the-end 
The End
 2019-05-27 19:45:51 +08:00
variableundefined
f6c9275e24 Merge pull request #11552 from Markolie/gammaborg 
Gamma borgs are now reset when security level is dropped below Gamma
 2019-05-27 18:14:54 +08:00
variableundefined
24b0e5248f Merge pull request #11465 from farie82/handcuff-nodrop-fix 
Can't use cuffs with nodrops now
 2019-05-25 21:01:18 +08:00
variableundefined
e333d765e3 Merge pull request #11444 from Kyep/throw_at_runtime 
Fixes throw_at runtime in vending machines
 2019-05-25 21:00:51 +08:00
Arkatos1
c55888ac94 fixes the root cause 2019-05-24 14:41:27 +02:00
Arkatos1
0a67689582 the actual fix 2019-05-24 03:40:19 +02:00
Arkatos1
4ff9f25e5e initial commit 2019-05-24 00:53:02 +02:00
Mark van Alphen
8fed0ac75c Re-add ghost space transitions, add ghost z level registering 2019-05-23 19:35:35 +02:00
Mark van Alphen
ef479cb982 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/feet.dmi
#	paradise.dme
 2019-05-23 19:04:09 +02:00
Mark van Alphen
ec70c2512d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles 
# Conflicts:
#	code/modules/clothing/masks/breath.dm
#	code/modules/clothing/masks/gasmask.dm
 2019-05-23 18:56:25 +02:00
variableundefined
17bbe5659c Merge pull request #11520 from Citinited/spooky-apcs 
Boo affects APCs (again) & no more infinite Boo
 2019-05-23 23:49:47 +08:00
variableundefined
0302a48780 Merge pull request #11521 from Arkatos1/splitfix 
Blob split consciousness fix
 2019-05-23 22:09:45 +08:00
variableundefined
256b4b35ce Merge pull request #11536 from dovydas12345/cryopod 
Fixes some issues with cryopod
 2019-05-23 22:08:16 +08:00
variableundefined
3545a9e75f Merge pull request #11567 from Couls/typo 
Fix typo in scanner code
 2019-05-23 22:07:04 +08:00
Couls
d0eca96d74 Fix typo in scanner code 2019-05-21 17:19:39 -04:00
Arkatos1
ca708563e5 more fixes 2019-05-20 21:02:53 +02:00
Arkatos1
72abc2665e fixes for cling aug vision and general action buttons 2019-05-20 15:42:20 +02:00
Arkatos1
bb4ac3d14b swap forms fix 2019-05-19 20:46:27 +02:00
Mark van Alphen
1a93d05275 Gamma borgs are now reset when security level is dropped below Gamma 2019-05-19 20:04:26 +02:00
Dovixx
cb33ec04f8 Fix headpocket being recovered 2019-05-17 21:49:36 +03:00
Dovixx
c2a81675e4 Add the path to cryopod preserve item list 2019-05-17 21:26:09 +03:00
Mark van Alphen
2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme
 2019-05-17 17:37:18 +02:00
Arkatos1
a78cf680de grammar fixes 2019-05-17 14:02:38 +02:00
variableundefined
909c1d4d71 Merge pull request #11479 from TDSSS/rejuv-change 
Lets vamp and cling anti-stun powers remove sleep too
 2019-05-17 19:18:35 +08:00
variableundefined
7076f2718b Merge pull request #11477 from Arkatos1/smartoutput 
Smartfridge gets smarter
 2019-05-17 19:18:01 +08:00
variableundefined
3338d8b907 Merge pull request #11476 from Arkatos1/inhand 
New inhand sprites
 2019-05-17 19:17:32 +08:00
variableundefined
1e62ac30ad Merge pull request #11439 from Arkatos1/LingIcons 
Changeling Evolution - Action Buttons!
 2019-05-17 19:15:16 +08:00
Fox McCloud
238780cae6 Merge pull request #11511 from Markolie/lighting 
Make the lighting plane master respect client color and other lighting fixes
 2019-05-15 20:42:44 -04:00
Fox McCloud
68effd9d83 The End 2019-05-13 17:22:57 -04:00
Mark van Alphen
0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-13 22:14:38 +02:00
Mark van Alphen
acbf627f8c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles 
# Conflicts:
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/customitems/item_defines.dm
 2019-05-13 22:08:49 +02:00
AffectedArc07
f35c87dc19 Merge branch 'master' into ss-ticker 2019-05-13 18:14:00 +01:00
Arkatos1
8a1f3ced79 Fix for admin spawned blob cores 2019-05-12 13:55:16 +02:00
Arkatos1
115f191084 blob split fix 2019-05-12 13:19:52 +02:00
variableundefined
10c1d71d53 Merge pull request #11483 from datlo/golem-traitor-fix 
Fix golem getting selected as auto traitors
 2019-05-12 07:39:27 +08:00
Citinited
cd3b25bd24 Boo affects APCs again 
Also reworks the boo code
 2019-05-11 18:15:13 +01:00
Mark van Alphen
5b14cf120d Make lighting plane master respect client color 2019-05-10 20:34:11 +02:00
Arkatos1
1c74f848e1 Merge https://github.com/ParadiseSS13/Paradise into LingIcons 2019-05-10 14:41:08 +02:00
datlo
edee2cfcea Replace by job check 2019-05-10 13:36:35 +01:00
Crazy Lemon
987dfeb436 Merge pull request #11470 from fludd12/conversation-starter 
Project Mind / Scan Mind
 2019-05-09 16:38:40 -07:00
Mark van Alphen
9f192885d3 Regex fix after merge conflict 2019-05-09 22:33:47 +02:00
Mark van Alphen
aad23a771c Fix serialize 2019-05-09 22:30:07 +02:00
Mark van Alphen
bf06a3e2aa Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into regexnttc 
# Conflicts:
#	code/game/machinery/telecomms/ntsl2.dm
 2019-05-09 22:27:47 +02:00
Mark van Alphen
a5d6f56927 Disable NTTC regex 2019-05-09 22:26:02 +02:00
Fel
2ed9e5d3d7 Sensation: *fades* 2019-05-09 15:32:57 -04:00
Fel
2a1f26ff8c You should've gone for the \ref 
*snap
 2019-05-09 15:19:05 -04:00