Commit Graph

81 Commits

Author SHA1 Message Date
S34N
606bd484ac Merge branch 'master' into AI_announcer_new 2021-08-05 09:53:03 +01:00
variableundefined
f9d6300bc9 Merge pull request #15678 from S34NW/gammadoesnotgrantguns
Gamma alert ≠ Gamma armoury
2021-07-26 14:00:12 -04:00
S34NW
a5cc1f325a Merge branch 'master' into AI_announcer_new 2021-07-20 17:39:30 +01:00
S34N
4b22d5b2dc Update code/modules/security_levels/security_levels.dm
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-10 14:11:21 +01:00
SabreML
64f1fd589d Adds a station alert level display to the join game menu (#16097)
* Alert Levels

* pain

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2021-05-29 21:12:35 +01:00
S34NW
5943a54a1e double sound fix 2021-05-02 13:50:40 +01:00
S34NW
b22ded5a93 What happened to you, AI? 2021-05-02 13:34:53 +01:00
S34NW
7297f81519 Alert does not equate to armory 2021-03-06 11:57:51 +00:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
AffectedArc07
8f72d7556e Annihilates the blackbox (#15132)
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
2020-12-24 16:06:48 -05:00
AffectedArc07
54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
AffectedArc07
f40a8163ff Codebase Cleanup - 2020-09-27 (#14472)
* Codebase Cleanup - 2020-09-27

* Endings

* Forgot meta

* Farie Tweaks
2020-10-15 13:22:52 -04:00
Kyep
d228a2cfa2 AA suggestions 2020-08-29 10:01:18 -07:00
Kyep
8412b2ab49 simplify 2020-08-28 17:50:30 -07:00
Kyep
d01dba1105 5s timer, smaller window, reason sharing 2020-08-28 17:29:42 -07:00
Kyep
a7114e70b3 [TGUI] Keycard Swiper 2020-08-28 17:03:51 -07:00
AffectedArc07
96840368d4 Merge pull request #13674 from Fox-McCloud/remove-atc
Removes Excessive Automated Yakking
2020-08-08 21:18:44 +01:00
Kyep
547d76fb4b Cyborg Improvements (#13056)
* ash storm immunity

* safety override & lavaproof upgrades

* mini-extinguisher for janiborg

* borg cell paths, prevent station borgs using gamma module

* Limit crew SecBorgs to 2, DS borg laser reflection

* replaces standard module with generalist module

* generalist borg gets crowbar

* fix bug where ert engi/med borgs runtime / do not get sprites

* adds TG lavaland and spidermin mining cyborg icons

* roundstart borgs=2, spawn locations=4

* adds damage_protection mechanic

* add xeno_disarm_chance

* ERT borg naming scheme: (level) ERT (number)

* std borg: tweaks hypo, RMs holoproj, adds mats/subsystems

* AA bullet_arc refactor

* refactors var/require_module to be bool, proc/action() to return bool

Suggested by farie82

* better radio for generalist

* rework gamma borgs, split of destroyer borgs

* dead robots fix

* fixes error caused by merging of PR 12932

* manually fix line endings

* fixes borg energy weapons (except disablers) not being recharged within recharging stations

* add trailing newline to make travis pass

* compatibility with #13471 life refactor

* deletes change to gamma sec ERT laser beam energy cost

* refactor handling of ash/lava immunities

* removes spiderlike mining borg sprite

* tweaks generalist borg loadout

* limit secborgs to 1 on green alert / roundstart

* re-run icondiffbot

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-06-28 14:16:14 -06:00
Fox McCloud
5d0db22b6f Removes Excessive Automated Yakking 2020-06-23 17:13:44 -04:00
Fox McCloud
c8a7607129 Purges a Bunch of In World Calls (#13641)
* Purges a Bunch of In World Calls

* tweaks and fixes also typeless lists

* typeless

* fixes

* tweak
2020-06-22 06:56:19 -06:00
AffectedArc07
210f8badf4 Makes all global variables handled by the GLOB controller (#13152)
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
2020-03-20 21:56:37 -06:00
AffectedArc07
a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00
Tayyyyyyy
fe396a40c9 Announce to command when ERT request transmitted (#13059)
* Announce to command when ERT request transmitted

* Improve announcement w/ reason and name of device
2020-03-03 09:07:08 -07:00
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Fox McCloud
67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
kazboo
5931fb5642 Final change of sound 2019-09-02 00:33:39 +02:00
kazboo
7458de5eef Delta code alarm sound added
Adds a nice metalic alarm sound for when self-destruct is being activated
2019-07-18 19:29:19 +02: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
Mark van Alphen
1b14f705e0 Add crisis check 2019-05-19 20:08:19 +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
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Ty-Omaha
a622330004 new siren 2019-03-28 22:43:06 -04:00
Ty-Omaha
f7dcde22d7 sound2 2019-03-28 21:15:20 -04:00
Ty-Omaha
cd57438ec7 sound1 2019-03-28 21:00:54 -04:00
datlo
ff397236b7 Reword command 2018-12-24 11:52:03 +00:00
datlo
34d9559c2f add access restriction removal to keycard swiper 2018-12-24 09:26:46 +00:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Birdtalon
074ee967e5 Merge branch 'master' into ERT-changes 2018-10-07 19:22:10 +01:00
Desolate
4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Crazy Lemon
ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle
Port Shuttle to StonedMC
2018-10-01 01:13:42 -07:00
Birdtalon
1628467857 Merge branch 'master' into ERT-changes
# Conflicts:
#	icons/mob/head.dmi
2018-09-30 14:53:32 +01:00
Birdtalon
c72561d194 addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines 2018-09-29 20:29:26 +01:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
variableundefined
bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
tigercat2000
77519c926f Make sec levels avoid overwriting an admin-forced nightshift 2018-04-04 09:26:14 -07:00
tigercat2000
8e5a42a7a1 Merge remote-tracking branch 'upstream/master' into night_shift
# Conflicts:
#	code/world.dm
2018-04-02 17:24:36 -07:00