cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge and compile fixes, changelog too.

Browse Source
This commit is contained in:
Erthilo
2012-05-19 02:39:50 +01:00
parent 0cec252e5b
commit 4406fca8c2
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/hud.dm
View File

@@ -11,10 +11,10 @@
#define ui_storage1 "SOUTH-1,4"
#define ui_storage2 "SOUTH-1,5"
#define ui_sstore1 "SOUTH+1,4"
#define ui_hstore1 "SOUTH+1,5"
#define ui_hstore1 "SOUTH+1,6"
#define ui_resist "EAST+1,SOUTH-1"
#define ui_gloves "SOUTH,5"
#define ui_glasses "SOUTH+1,6"
#define ui_glasses "SOUTH+1,5"
#define ui_lear "SOUTH,7"
#define ui_rear "SOUTH,6"
#define ui_head "SOUTH+1,2"

2
code/game/objects/door_assembly.dm
View File

@@ -97,7 +97,7 @@ obj/structure/door_assembly
name = "Research Airlock Assembly"
icon_state = "door_as_res1"
glass_base_icon_state = "door_as_gres"
glass_type = /obj/machinery/door/airlock/glass_research
glass_type = /obj/machinery/door/airlock/glass/glass_research
airlock_type = /obj/machinery/door/airlock/research
anchored = 1
density = 1

11
code/modules/mob/living/carbon/human/human.dm
View File

@@ -2125,17 +2125,6 @@ It can still be worn/put on as normal.
item.layer = 20
target.back = item
item.loc = target
if("h_store")
if (target.h_store)
var/obj/item/W = target.h_store
target.u_equip(W)
if (target.client)
target.client.screen -= W
if (W)
W.loc = target.loc
W.dropped(target)
W.layer = initial(W.layer)
W.add_fingerprint(source)
if("handcuff")
if (target.handcuffed)
var/obj/item/W = target.handcuffed

14
html/changelog.html
View File

@@ -47,6 +47,20 @@ Stuff which is in development and not yet visible to players or just code relate
should be listed in the changelog upon commit though. Thanks. -->
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
<div class="commit sansserif">
<h2 class="date">19 May 2012</h2>
<h3 class="author">TG updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Buckling into an office chair and using a fire extinguisher will lead to interesting results.</li>
<li class="tweak">Recipe updates for some booze in an attempt to resolve recipe conflicts.</li>
<li class="tweak">Wallets now fit in pockets.</li>
<li class="tweak">If you are clicking on a storage item in your pocket with an empty hand it will return that item to your hand.</li>
<li class="tweak">Extinguishers now say when they are empty.</li>
<li class="imageadd">New sprites for Cargo, HoP, and Captain's lockers.</li>
<li class="rscdel">Removed hat storage as it was never used and it cluttered the UI.</li>
</ul>
</div>
<div class="commit sansserif">
<h2 class="date">17 May 2012</h2>
<h3 class="author">TG updated:</h3>