cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 08:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	maps/aurora/aurora-4_mainlevel.dmm
This commit is contained in:
skull132
2018-06-17 23:19:10 +03:00
parent 9da929d4a1 d274dec76a
commit a276504130
11 changed files with 159 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/random.dm
-1
View File
@@ -676,7 +676,6 @@
/obj/item/clothing/under/overalls = 1,
/obj/item/clothing/under/redcoat = 0.5,
/obj/item/clothing/under/serviceoveralls = 1,
/obj/item/clothing/under/psyche = 0.5,
/obj/item/clothing/under/rank/dispatch = 0.8,
/obj/item/clothing/under/syndicate/tacticool = 1,
/obj/item/clothing/under/syndicate/tracksuit = 0.2,
code/modules/cargo/randomstock.dm
+4 -4
View File
@@ -684,17 +684,17 @@ var/list/global/random_stock_large = list(
var/list/allgloves = typesof(/obj/item/clothing/gloves)
var/list/exclusion = list(/obj/item/clothing/gloves,
/obj/item/clothing/gloves/fluff,
/obj/item/clothing/gloves/black/fluff,
/obj/item/clothing/gloves/white/unathi/fluff,
/obj/item/clothing/gloves/swat/bst,
/obj/item/clothing/gloves/swat/fluff,
/obj/item/clothing/gloves/black/fluff,
/obj/item/clothing/gloves/powerfist,
/obj/item/clothing/gloves/claws)
exclusion += typesof(/obj/item/clothing/gloves/rig)
exclusion += typesof(/obj/item/clothing/gloves/lightrig)
exclusion += typesof(/obj/item/clothing/gloves/watch)
exclusion += typesof(/obj/item/clothing/gloves/swat/fluff)
exclusion += typesof(/obj/item/clothing/gloves/black/fluff)
exclusion += typesof(/obj/item/clothing/gloves/white/unathi/fluff)
exclusion += typesof(/obj/item/clothing/gloves/fluff)
allgloves -= exclusion
var/number = rand(1,5)
while (number > 0)
code/modules/customitems/item_defines.dm
+42 -1
View File
@@ -2265,4 +2265,45 @@ obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A.
new /obj/item/fluff/yarn/blue(src)
new /obj/item/fluff/yarn/green(src)
new /obj/item/fluff/yarn/purple(src)
new /obj/item/fluff/yarn/yellow(src)
new /obj/item/fluff/yarn/yellow(src)
/obj/item/clothing/under/fluff/moyers_shirt //Custom Martian Raider T-Shirt - Caiden Moyers - tylaaaar
name = "custom martian raider t-shirt"
desc = "A Martian Raider Spaceball T-shirt with the name \"MOYERS\" written on the back in plain white text."
icon = 'icons/obj/custom_items/moyers_shirt.dmi'
icon_state = "moyers_shirt"
item_state = "moyers_shirt"
contained_sprite = TRUE
/obj/item/clothing/suit/fluff/eri_robes //Senior Alchemist Robes - Eri Akhandi - paradoxspace
name = "senior alchemist robes"
desc = "A green set of robes, trimmed with what appears to be real gold. Looking at the necklace, you can see the alchemical symbol for the Philosopher's Stone, made of ruby."
icon = 'icons/obj/custom_items/eri_robes.dmi'
icon_state = "eri_robes"
item_state = "eri_robes"
contained_sprite = TRUE
/obj/item/fluff/halstere_card //Solarian Alliance Military ID - Kalren Halstere - brutishcrab51
name = "solarian alliance military ID"
desc = "A green and white military identification card, with an Alliance of Sovereign Solarian Nations sigil stamped on the front."
icon = 'icons/obj/custom_items/halstere_clothing.dmi'
icon_state = "halstere_card"
w_class = 2
var/flipped = FALSE
/obj/item/fluff/halstere_card/attack_self(mob/user as mob)
flipped = !flipped
queue_icon_update()
/obj/item/fluff/halstere_card/update_icon()
if(flipped)
icon_state = "halstere_card_open"
else
icon_state = initial(icon_state)
/obj/item/fluff/halstere_card/examine(mob/user)
if(..(user, 1) && flipped)
to_chat(user, "The name 'Halstere, Kalren C.' is stamped on it. An expiration date is listed on it, '2465JAN01'. A pay grade is listed beside the name. 'MAJ/O4'. A number is listed under the expiration date: '14015236810'.")
code/modules/modular_computers/computers/modular_computer/interaction.dm
+2 -2
View File
@@ -63,7 +63,7 @@
for(var/datum/computer_file/program/P in idle_threads)
P.event_idremoved(1)
card_slot.stored_card.forceMove(get_turf(src))
user.put_in_hands(card_slot.stored_card)
card_slot.stored_card = null
update_uis()
to_chat(user, "You remove the card from \the [src]")
@@ -88,7 +88,7 @@
to_chat(user, "There is no intellicard connected to \the [src].")
return
ai_slot.stored_card.forceMove(get_turf(src))
user.put_in_hands(ai_slot.stored_card)
ai_slot.stored_card = null
ai_slot.update_power_usage()
update_uis()
code/modules/multiz/turfs/open_space.dm
+1 -1
View File
@@ -120,7 +120,7 @@
. = ..()
icon_state = "Fill"
/turf/simulated/open/airless/chasm/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
/turf/simulated/open/chasm/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
underlay_appearance.icon = 'icons/turf/basalt.dmi'
underlay_appearance.icon_state = "basalt"
if (prob(20))
html/changelog.html
+12
View File
@@ -56,6 +56,18 @@
-->
<div class="commit sansserif">
<h2 class="date">16 June 2018</h2>
<h3 class="author">Arrow768 updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">ID Cards ejected from modular computers are no longer ejected onto the floor.</li>
</ul>
<h2 class="date">10 June 2018</h2>
<h3 class="author">Arrow768 updated:</h3>
<ul class="changes bgimages16">
<li class="rscdel">The psychedelic jumpsuit can no longer be found in maint.</li>
</ul>
<h2 class="date">03 June 2018</h2>
<h3 class="author">BurgerBB updated:</h3>
<ul class="changes bgimages16">
html/changelogs/.all_changelog.yml
+7
View File
@@ -5529,3 +5529,10 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
from disposal inlets.
- bugfix: Disposal outlets now spread out items so all the trash doesn't pile up
on one tile.
2018-06-10:
Arrow768:
- rscdel: The psychedelic jumpsuit can no longer be found in maint.
2018-06-16:
Arrow768:
- tweak: ID Cards ejected from modular computers are no longer ejected onto the
floor.
icons/obj/custom_items/eri_robes.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 779 B

icons/obj/custom_items/halstere_clothing.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

icons/obj/custom_items/moyers_shirt.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 813 B

maps/aurora/aurora-4_mainlevel.dmm
+91 -88
View File
@@ -63589,7 +63589,7 @@
dir = 1
},
/obj/effect/landmark/start{
name = "Journalist"
name = "Corporate Reporter"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -65114,14 +65114,17 @@
/turf/simulated/floor/tiled,
/area/quartermaster/office)
"cxJ" = (
/obj/machinery/camera/network/supply{
c_tag = "Cargo - Warehouse Entrence";
dir = 1
},
/obj/effect/floor_decal/corner/brown{
dir = 10
},
/obj/machinery/camera/network/supply{
c_tag = "Cargo - Warehouse Entrance";
dir = 1
},
/obj/machinery/light/small,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"cxK" = (
@@ -94930,7 +94933,7 @@ bPK
cbD
cxK
ccf
cxN
cxK
cdh
aaa
aab
@@ -95402,7 +95405,7 @@ aXq
bEu
cuL
cuR
cvf
cuR
cvp
bFv
bFv
@@ -95914,17 +95917,17 @@ bxs
bCA
aXt
bEt
cuN
cuM
cuT
bGA
cvr
bKA
bGy
cvO
cwa
cvO
bGy
bFv
cwD
cwC
cwR
cxa
bPI
@@ -96431,17 +96434,17 @@ cuI
cuO
cuV
cvi
cvt
cvi
cvz
cvE
cvP
cwb
cwn
cwb
cwv
cwE
cwS
cxc
cxj
cwJ
bPI
bRS
cxs
@@ -96692,8 +96695,8 @@ bGy
bGA
cvF
cvQ
cwc
cwo
cvk
cwf
bGy
cwF
bGy
@@ -96890,11 +96893,11 @@ aja
aja
crQ
crZ
csi
css
csC
csN
csZ
crQ
csr
csr
csr
csr
asw
auk
avI
@@ -96948,19 +96951,19 @@ bGA
bGA
bGA
bGA
cvR
cvQ
cwd
cwp
bGy
cwG
cwF
bGy
cxe
cxd
bGy
bPI
cxp
cxu
bRS
cxB
cxA
bTf
bPI
bPJ
@@ -97151,7 +97154,7 @@ csj
cst
csD
csO
cta
csr
asx
auk
avJ
@@ -97205,11 +97208,11 @@ cvj
cvu
cvA
bKx
cvS
cwe
cwq
cvQ
cwd
cwd
bGy
cwH
cwF
bGy
cxf
bGy
@@ -97217,7 +97220,7 @@ bPI
cxq
bRw
bRT
cxC
cxA
bTh
bPI
bPJ
@@ -97404,10 +97407,10 @@ cmy
crO
crS
csb
csk
csu
csE
csP
crU
crU
crU
crU
ctb
asy
aul
@@ -97462,13 +97465,13 @@ cvk
bGy
cvB
cvG
cvT
cvQ
cwf
cwr
bGy
cwI
cwF
bGy
cxg
cxf
cxk
bPI
bPI
@@ -97721,8 +97724,8 @@ cvC
cvH
cvU
cwg
cws
cww
cwg
cwg
cwJ
bGA
bGA
@@ -97922,7 +97925,7 @@ csm
csw
csG
csR
ctd
csr
asA
aum
avK
@@ -97980,8 +97983,8 @@ cvV
cwh
bGy
cwx
cwK
cwT
cwr
cwf
bGy
cxl
bFv
@@ -98179,7 +98182,7 @@ csn
csx
csH
csS
cte
csr
asB
aun
avM
@@ -98236,10 +98239,10 @@ cvJ
cvW
cwi
cwt
cwy
cwp
cwL
cwU
cxh
cwx
bOJ
bFv
bMj
@@ -98436,7 +98439,7 @@ cso
csy
csI
csT
ctf
crQ
asC
auo
avN
@@ -98490,12 +98493,12 @@ cvn
bII
bFv
cvK
cvX
cwj
cvW
cwi
bGy
cwz
cwM
cwV
cwr
cwf
cwr
bGy
cxm
bFv
@@ -98690,8 +98693,8 @@ cmI
crX
csg
csp
csz
csJ
csp
csp
csU
ctg
cnQ
@@ -98746,7 +98749,7 @@ cvd
bHR
cvw
bFv
cvL
cvK
cvY
cwk
cwu
@@ -98936,12 +98939,12 @@ aaV
adY
clC
aja
crg
crf
crm
cru
crC
cmD
crN
crC
cmD
aja
crY
@@ -98950,7 +98953,7 @@ csq
csA
csK
csV
cth
crQ
asE
aup
avK
@@ -99008,9 +99011,9 @@ bFv
cwl
bFv
cwB
cwN
cwW
cxi
cuR
cuR
cvp
bFv
bFv
bPJ
@@ -99204,10 +99207,10 @@ afe
afe
afe
csr
csB
csr
csL
csW
cti
csr
asF
aun
avM
@@ -102565,10 +102568,10 @@ axP
ctu
ctD
ctM
ctV
ctM
cue
cun
cuw
ctu
ctu
aYW
bah
bbv
@@ -102819,13 +102822,13 @@ asL
aJs
aLc
aMV
ctv
ctu
ctE
ctN
ctW
cuf
cuo
cux
ctu
aYX
bah
bbw
@@ -103076,13 +103079,13 @@ asL
axP
aLd
aMW
ctw
ctu
ctF
ctF
ctO
ctX
cug
cup
cuy
ctu
aYY
bah
bbx
@@ -103334,12 +103337,12 @@ aJt
aLe
aMX
ctx
ctG
ctF
ctP
ctY
cuh
cuq
cuz
ctu
aYY
bah
bby
@@ -103596,7 +103599,7 @@ ctQ
ctZ
cui
cur
cuA
ctu
aYY
bah
bbz
@@ -103850,10 +103853,10 @@ aMZ
ctz
ctI
ctR
cua
ctR
cuj
cus
cuB
ctu
aYZ
bah
bbA
@@ -104106,10 +104109,10 @@ aLg
aNa
ctA
ctJ
ctS
cub
cuk
cut
ctF
ctF
ctF
ctF
cuC
aYY
bah
@@ -104366,8 +104369,8 @@ ctK
ctT
cuc
cul
cuu
cuD
ctE
ctu
aZa
bah
bbC
@@ -104618,13 +104621,13 @@ aGb
awc
aLh
ctt
ctC
ctL
ctU
cud
cum
cuv
cuE
ctu
ctu
ctu
ctu
ctu
ctu
ctu
aZb
bah
bbD