The Opposing Force (OPFOR) - Ready for review/testing (#10093)

* OPFOR PART ONE

* 0

* E

* E

* 0

* E

* e

* Update opposing_force_datum.dm

* E

* E

* Admin stuffs

* Admin control GUI

* E

* Chat

* 0

* Update opposing_force_datum.dm

* System messages, better admin chat procs, UI fixes.

* Update _basemap.dm

* who thought holding a ref to the client was a good fucking idea?

* 0

* Update opposing_force_datum.dm

* Update modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm

* Equipment tab

* equipment part 2

* Tidy up, finishing up equipments panel, some font fixes

* clarity and continuity

* Update opposing_force_datum.dm

* more logic fixes

* Update opposing_force_datum.dm

* weeee

* Update opposing_force_datum.dm

* chat commands

* 0

* ee

* Update opposing_force_datum.dm

* Itemspawning

* Assassinate objectives only need one kill

* new commands

* Update opposing_force_datum.dm

* f

* weee roundend report

* E

* ew

* E

* E

* more fixes

* E

* E

* Update opposing_force_datum.dm

* Update opposing_force_datum.dm

* Fixes

* request opfor

* Update admin_procs.dm

* Update adminhelp.dm

* Update opposing_force_datum.dm

* fex

* admin info panel, approve checks, queue position checks

* panel improvements, better logging format

* Barboza equipment list Vol 1 (#10386)

* Update opposing_force_equipment.dm

* silly little changes to the silly little code

i doubt this will be seen by anyone teehee

* OpFor Prep Balance

Shotguns have been prepped into opfor catalog. Model 23-37 is now an 8 rounder pump action, M2 is untouched as a semi auto peacekeeper variation and SAS14 is semi auto as it was meant to be

* OpFor Prep Balance

Shotguns have been prepped into opfor catalog. Model 23-37 is now an 8 rounder pump action, M2 is untouched as a semi auto peacekeeper variation and SAS14 is semi auto as it was meant to be. 23-37 keeps its beanbag load while M2 comes with slugs as a proper combat shotgun

* Gear Pass 1

* Mag Variety for SAS14

Since its gonna be an opfor exclusive why not add some choices. Refilling its ammo is nigh impossible so here comes new mags!

* Gear Pass 2

yes I 'code' in github web

* Gear Pass 3

just martial arts and some stuff for today, tomorrow i add the discord suggestions

* opfor equipment up the ass

woo spider

* descs for everyone

* g357

* altyn

* Gear Pass 4

syndicakes and nri

* Item Variety Document for Opfor

* gunman loadout

* gunman update

* Gear Pass 5

gear harder

* Update opposing_force_equipment.dm

* big typo fuckup fix

* lcoat desc fix

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/opposing_force/code/opposing_force_equipment.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/opposing_force/code/opposing_force_equipment.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/opposing_force/code/opposing_force_equipment.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/opposing_force/code/opposing_force_equipment.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/opposing_force/code/opposing_force_equipment.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/opposing_force/code/opposing_force_equipment.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/opposing_force/code/opposing_force_equipment.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* DocNameChange

also no more shamwow

* Update opposing_force_equipment.dm

* Update modular_skyrat/modules/sec_haul/code/guns/guns.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/sec_haul/code/guns/guns.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update items.dm

* Update opposing_force_equipment.dm

* Update modular_skyrat/modules/opposing_force/code/items.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* More Categories and Expanded Title

Adds loadouts and explosives tab, increases title limit to 40 instead of 20 for objectives

* Apply suggestions from code review

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

Co-authored-by: dawsonkeyes <76002401+dawsonkeyes@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>

* Automatic changelog generation for PR #10386 [ci skip]

* E

* Update opposing_force_equipment.dm

* E

* Update items.dm

* Vol2Remastered (#10413)

* Update modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Bye bye high-frequency sword

* Fixed the space cash too

* Review comments

* Update counter.dm

* general antagonist ban

* opfor ban

* Update opposing_force_subsystem.dm

Co-authored-by: ErdinyoBarboza <erdinyobarboza@gmail.com>
Co-authored-by: dawsonkeyes <76002401+dawsonkeyes@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
Gandalf
2022-01-20 04:15:15 +00:00
committed by GitHub
co-authored by Tom dawsonkeyes GoldenAlpharex ErdinyoBarboza SkyratBot GoldenAlpharex
parent 09130092c4
commit 4375bd7432
30 changed files with 2665 additions and 53 deletions
+1
View File
@@ -95,6 +95,7 @@ GLOBAL_PROTECT(admin_verbs_sounds)
GLOBAL_LIST_INIT(admin_verbs_fun, list(
/client/proc/one_click_antag, // SKYRAT EDIT ADDITION - ONE CLICK ANTAG
/client/proc/spawn_mob_spawner, // SKYRAT EDIT ADDITION
/client/proc/request_more_opfor, //SKYRAT EDIT ADDITION
/client/proc/cmd_select_equipment,
/client/proc/cmd_admin_gib_self,
/client/proc/drop_bomb,
+2
View File
@@ -191,5 +191,7 @@
dat += build_antag_listing()
dat += SSopposing_force.get_check_antag_listing() //SKYRAT EDIT ADDITION
dat += "</body></html>"
usr << browse(dat.Join(), "window=roundstatus;size=500x500")
+3 -1
View File
@@ -367,7 +367,9 @@
BAN_MOB_CONTROL,
BAN_GHOST_ROLE_SPAWNER,
BAN_GHOST_TAKEOVER,
BAN_EORG
BAN_EORG,
BAN_ANTAGONIST,
BAN_OPFOR,
),//SKYRAT EDIT ADDITION - EXTRA_BANS
)
for(var/department in long_job_lists)
+5
View File
@@ -112,6 +112,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
L[++L.len] = list("Closed Tickets:", "[cstatclick.update("[closed_tickets.len]")]", null, REF(cstatclick))
L[++L.len] = list("Resolved Tickets:", "[rstatclick.update("[resolved_tickets.len]")]", null, REF(rstatclick))
//SKYRAT EDIT ADDITION
if(LAZYLEN(SSopposing_force.submitted_applications))
for(var/datum/opposing_force/opposing_force as anything in SSopposing_force.submitted_applications)
L[++L.len] = list("[opposing_force.handling_admin ? "H-[opposing_force.handling_admin]. " : ""]OPFOR: [opposing_force.ckey]", null, REF(opposing_force))
//SKYRAT EDIT END
return L
//Reassociate still open ticket if one exists