mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
urg
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
|
||||
|
||||
/obj/item/clothing/head/centhat
|
||||
name = "\improper CentCom hat"
|
||||
icon_state = "centcom"
|
||||
@@ -120,7 +122,6 @@
|
||||
icon_state = "flat_cap"
|
||||
item_state = "detective"
|
||||
|
||||
|
||||
/obj/item/clothing/head/pirate
|
||||
name = "pirate hat"
|
||||
desc = "Yarr."
|
||||
@@ -246,7 +247,7 @@
|
||||
/obj/item/clothing/head/cone
|
||||
desc = "This cone is trying to warn you of something!"
|
||||
name = "warning cone"
|
||||
icon = 'icons/obj/janitor.dmi'
|
||||
icon = 'yogstation/icons/obj/janitor.dmi' //yogs changed icon path
|
||||
icon_state = "cone"
|
||||
item_state = "cone"
|
||||
force = 1
|
||||
@@ -404,4 +405,4 @@
|
||||
name = "red taqiyah"
|
||||
desc = "An extra-mustahabb way of showing your devotion to Allah."
|
||||
icon_state = "taqiyahred"
|
||||
pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
|
||||
pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
|
||||
@@ -3357,5 +3357,6 @@
|
||||
#include "yogstation\code\modules\vending\wardrobes.dm"
|
||||
#include "yogstation\code\modules\webhook\webhook.dm"
|
||||
#include "yogstation\code\modules\xenoarch\loot\gigadrill.dm"
|
||||
#include "yogstation\code\modules\xenoarch\loot\guns.dm"
|
||||
#include "yogstation\interface\interface.dm"
|
||||
// END_INCLUDE
|
||||
|
||||
@@ -166,12 +166,12 @@
|
||||
- <ParseParamExpression()>
|
||||
*/
|
||||
ParseExpression(list/end=list(/token/end), list/ErrChars=list("{", "}"), check_functions = 0, check_assignments = 1)
|
||||
var/stack
|
||||
opr=new
|
||||
val=new
|
||||
var/stack/opr = new
|
||||
var/stack/val = new
|
||||
|
||||
src.expecting=VALUE
|
||||
var/loop = 0
|
||||
for()
|
||||
while(TRUE)
|
||||
loop++
|
||||
if(loop > 800)
|
||||
errors+=new/scriptError("Too many nested tokens.")
|
||||
@@ -282,7 +282,7 @@
|
||||
NextToken() //skip open parenthesis, already found
|
||||
var/loops = 0
|
||||
|
||||
for()
|
||||
while(TRUE)
|
||||
loops++
|
||||
if(loops>=800)
|
||||
errors += new/scriptError("Too many nested expressions.")
|
||||
@@ -305,7 +305,7 @@
|
||||
NextToken() // skip the "list" word
|
||||
NextToken() // skip the open parenthesis
|
||||
var/loops = 0
|
||||
for()
|
||||
while(TRUE)
|
||||
loops++
|
||||
if(loops >= 800)
|
||||
errors += new /scriptError("Too many nested expressions.")
|
||||
|
||||
@@ -181,7 +181,7 @@ Represents a special statement in the code triggered by a keyword.
|
||||
parser.NextToken()
|
||||
if(!parser.CheckToken("(", /token/symbol))
|
||||
return KW_FAIL
|
||||
for() //for now parameters can be separated by whitespace - they don't need a comma in between
|
||||
while(TRUE) //for now parameters can be separated by whitespace - they don't need a comma in between
|
||||
if(istype(parser.curToken, /token/symbol))
|
||||
switch(parser.curToken.value)
|
||||
if(",")
|
||||
|
||||
@@ -180,9 +180,9 @@
|
||||
Reads characters separated by an item in <delim> into a token.
|
||||
*/
|
||||
ReadWord()
|
||||
var
|
||||
char=copytext(code, codepos, codepos+1)
|
||||
buf
|
||||
var/char = copytext(code, codepos, codepos+1)
|
||||
var/buf
|
||||
|
||||
while(!delim.Find(char) && codepos<=lentext(code))
|
||||
buf+=char
|
||||
char=copytext(code, ++codepos, codepos+1)
|
||||
@@ -197,9 +197,8 @@
|
||||
Reads a symbol into a token.
|
||||
*/
|
||||
ReadSymbol()
|
||||
var
|
||||
char=copytext(code, codepos, codepos+1)
|
||||
buf
|
||||
var/char = copytext(code, codepos, codepos+1)
|
||||
var/buf
|
||||
|
||||
while(options.symbols.Find(buf+char))
|
||||
buf+=char
|
||||
@@ -214,10 +213,9 @@
|
||||
Reads a number into a token.
|
||||
*/
|
||||
ReadNumber()
|
||||
var
|
||||
char=copytext(code, codepos, codepos+1)
|
||||
buf
|
||||
dec=0
|
||||
var/char = copytext(code, codepos, codepos+1)
|
||||
var/buf
|
||||
var/dec=0
|
||||
|
||||
while(options.IsDigit(char) || (char=="." && !dec))
|
||||
if(char==".") dec=1
|
||||
|
||||
62
yogstation/code/modules/xenoarch/loot/guns.dm
Normal file
62
yogstation/code/modules/xenoarch/loot/guns.dm
Normal file
@@ -0,0 +1,62 @@
|
||||
#define XENOARCH_SPUR_SPAWN_POLARSTAR 0
|
||||
#define XENOARCH_SPUR_SPAWN_MODKIT 1
|
||||
#define XENOARCH_SPUR_SPAWN_NOTHING 2
|
||||
//this is currently unimplemented but it will be used in order to prevent multiple
|
||||
// guns from spawning as only 1 copy should exists in the game would at any time
|
||||
|
||||
GLOBAL_VAR_INIT(polarstar, XENOARCH_SPUR_SPAWN_POLARSTAR)
|
||||
|
||||
/obj/item/gun/energy/polarstar
|
||||
name = "Polar Star"
|
||||
desc = "Despite being incomplete, the severe wear on this gun shows to which extent it's been used already."
|
||||
icon = 'yogstation/icons/obj/xenoarch/guns.dmi'
|
||||
lefthand_file = 'yogstation/icons/mob/inhands/weapons/xenoarch_lefthand.dmi'
|
||||
righthand_file = 'yogstation/icons/mob/inhands/weapons/xenoarch_righthand.dmi'
|
||||
icon_state = "polarstar"
|
||||
item_state = "polarstar"
|
||||
slot_flags = SLOT_BELT
|
||||
fire_delay = 1
|
||||
recoil = 1
|
||||
cell_type = /obj/item/stock_parts/cell
|
||||
|
||||
var/fire_power = "" //TODO MAYBE?
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//#################//
|
||||
//###PROJECTILES###//
|
||||
//#################//
|
||||
|
||||
/obj/item/ammo_casing/energy/polarstar
|
||||
projectile_type = /obj/item/projectile/bullet/polarstar
|
||||
select_name = "polar star lens"
|
||||
e_cost = 100
|
||||
fire_sound = null
|
||||
harmful = TRUE
|
||||
|
||||
|
||||
/obj/item/projectile/bullet/polarstar
|
||||
name = "polar star bullet"
|
||||
range = 100
|
||||
damage = 40
|
||||
damage_type = BRUTE
|
||||
icon = 'yogstation/icons/obj/xenoarch/guns.dmi'
|
||||
icon_state = "spur_high"
|
||||
|
||||
/obj/item/projectile/bullet/polarstar/fire(angle, atom/direct_target)
|
||||
if(!fired_from || !istype(fired_from,/obj/item/gun/energy))
|
||||
return ..()
|
||||
|
||||
var/obj/item/gun/energy/fired_gun = fired_from
|
||||
|
||||
switch(fired_gun.cell.maxcharge)
|
||||
|
||||
BIN
yogstation/icons/mob/inhands/weapons/xenoarch_lefthand.dmi
Normal file
BIN
yogstation/icons/mob/inhands/weapons/xenoarch_lefthand.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 714 B |
BIN
yogstation/icons/mob/inhands/weapons/xenoarch_righthand.dmi
Normal file
BIN
yogstation/icons/mob/inhands/weapons/xenoarch_righthand.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 714 B |
BIN
yogstation/icons/obj/xenoarch/guns.dmi
Normal file
BIN
yogstation/icons/obj/xenoarch/guns.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
yogstation/sound/weapons/spur_chargefull.ogg
Normal file
BIN
yogstation/sound/weapons/spur_chargefull.ogg
Normal file
Binary file not shown.
BIN
yogstation/sound/weapons/spur_chargehigh.ogg
Normal file
BIN
yogstation/sound/weapons/spur_chargehigh.ogg
Normal file
Binary file not shown.
BIN
yogstation/sound/weapons/spur_chargelow.ogg
Normal file
BIN
yogstation/sound/weapons/spur_chargelow.ogg
Normal file
Binary file not shown.
BIN
yogstation/sound/weapons/spur_chargemed.ogg
Normal file
BIN
yogstation/sound/weapons/spur_chargemed.ogg
Normal file
Binary file not shown.
BIN
yogstation/sound/weapons/spur_high.ogg
Normal file
BIN
yogstation/sound/weapons/spur_high.ogg
Normal file
Binary file not shown.
BIN
yogstation/sound/weapons/spur_hitmob.ogg
Normal file
BIN
yogstation/sound/weapons/spur_hitmob.ogg
Normal file
Binary file not shown.
BIN
yogstation/sound/weapons/spur_hitwall.ogg
Normal file
BIN
yogstation/sound/weapons/spur_hitwall.ogg
Normal file
Binary file not shown.
BIN
yogstation/sound/weapons/spur_low.ogg
Normal file
BIN
yogstation/sound/weapons/spur_low.ogg
Normal file
Binary file not shown.
BIN
yogstation/sound/weapons/spur_medium.ogg
Normal file
BIN
yogstation/sound/weapons/spur_medium.ogg
Normal file
Binary file not shown.
BIN
yogstation/sound/weapons/spur_spawn.ogg
Normal file
BIN
yogstation/sound/weapons/spur_spawn.ogg
Normal file
Binary file not shown.
Reference in New Issue
Block a user