Commit Graph

67 Commits

Author SHA1 Message Date
Sara
8091d7a060 More maints 2024-10-31 21:04:30 -06:00
Sara
b0957d7def A-Maze-ing addition 2024-10-31 11:35:52 -06:00
Sara
bd5d56336b Major push 2024-10-30 23:14:31 -06:00
ariaworld
27e2e80cb8 Add: random-gen maintenance and other useful things 2024-09-08 22:46:28 +02:00
BongaTheProto
13cd269788 Merge remote-tracking branch 'upstream/master' 2023-12-25 14:28:51 -05:00
SandPoot
7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
Tsurupeta
d4ec25e748 all else 2023-08-08 14:01:18 +03:00
Zirok
17be7bdddb Fix antag spawners landmarks hard deleting. This seems to have been an issue related to init order. Commenting out the return INITIALIZE_HINT_QDEL works as well. 2022-08-27 10:42:23 +02:00
BongaTheProto
9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
Putnam3145
33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
AManWithAToolbox
dda0869f82 Merge branch 'pr/1' into its-wasnt-gonna-happen 2022-04-18 23:19:18 -05:00
TemptStation
9b63431a50 Merge pull request #5 from NullFag/kill_me
smexi fix
2022-04-15 00:40:12 +02:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145
629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
James
9258b93f64 Modularises (most of) the code into EROS module folder 2021-12-05 19:39:24 +00:00
James
f3726aba32 Added slave collars, slave console and modified comms console 2021-12-02 17:01:23 +00:00
DeltaFire
6aa906395c not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
Ghom
335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -07:00
Detective-Google
bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002)
* ports all the tg junk for icemoon, not yet changed to make it all compile

* fixes

* fixes

* fixes

* fixes

* fixes

* new stuff

* whew

* fixes

* it compiles, now to fix the maps

* fixes the maps

* fixes solars + removes the space tiles in the toxins burn chamber

* nukes the SpawnTerrain proc used for tg geysers

* linter fix

* fix

* fixes the non matching turf atmos (hopefully)

* more mapping fixes

* dmm2tgm

* unfucks changeturf for the more_caves

* fixes the volanic subtypes of the other thing

* fixes the stupid fucking tile placing list

* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

* fixes a bunch of mismatch atmos in ruins

* fixes wendigo cave having no air

* backwards couch backwards couch

* fixes the SM up

* wendigos can't runtime when butchering if you can't butcher them 😎

* makes the wendigo fight have the same atmos as the surrounding icemoon

* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work

* makes the wendigo screech shake not completely aids

* fixes snowlegion portals dropping proper legions instead of skeles

* brings the engioutpost ruin over as well

* whoopps

* empty commit to reroll bots

* Fixes pirates, ops, the mining base, and gives pirates and ops drills

* fixes lone ops and ninjas

* fixes the snowed plating getting fucked when tiles are placed on it

* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)

* more bug fixes

* empty commit to reroll bots

* hopefully finally kills the active turfs on the library ruin

Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
2020-05-07 14:46:16 +02:00
kevinz000
5c5fc37959 Introducing noitatsxoB (#12073)
* okay

* ok

* ok

* ok

* ok

* why am i doing this

* WHY DID I DO THIS

* mirror doesn't work

* compile

* shuttles should work

* fix engine

* fix engine

* off by 1

* ok

* adds proccall to write next map

* haha post processing funny

* fixes

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-06 17:50:50 +02:00
Ghommie
de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
Ghommie
d5a43be181 Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart. 2020-04-19 03:07:45 +02:00
keronshb
830f646383 Revert "Merge pull request #11225 from r4d6/Random-Mining"
This reverts commit ea5774e713.
2020-03-22 15:55:08 -04:00
r4d6
f76a1c15f3 Port random mining base 2020-02-24 13:27:54 -05:00
Detective Google
4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
Ghom
3519fbc909 F 2020-02-01 02:16:52 +01:00
Ghommie
ab4aa29576 clown ops infiltrator consistency. 2020-02-01 00:02:31 +01:00
Putnam
52e473ba07 argh 2020-01-25 19:42:36 -08:00
r4d6
e3cb379bde Add the Mining Base as a submap 2020-01-21 20:31:40 -05:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Putnam
f728c4746f Allowed random engines to be weighted. 2020-01-06 16:25:17 -08:00
r4d6
b909f54ba5 Revert "Revert "Add the option to restrict the Engine that spawn""
This reverts commit d851beea16.
2019-12-23 10:25:37 -05:00
r4d6
d851beea16 Revert "Add the option to restrict the Engine that spawn"
This reverts commit e3e1f91635.
2019-12-23 10:23:55 -05:00
r4d6
e3e1f91635 Add the option to restrict the Engine that spawn 2019-12-23 10:06:35 -05:00
r4d6
383e09651f Suggestions 2019-12-21 14:55:37 -05:00
r4d6
dbf3e7d246 Add the landmarks 2019-12-19 15:27:45 -05:00
kevinz000
38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
CitadelStationBot
98d18ee7e3 [MIRROR] Removes tripai landmark (#5280)
* Removes tripai landmark

* Update landmarks.dm
2018-02-05 04:44:31 -06:00
CitadelStationBot
32fab09c69 [MIRROR] Remove revenantspawn landmark from code (#5271)
* Remove revenantspawn landmark from code (#35238)

* Remove revenantspawn landmark from code
2018-02-05 01:47:16 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Leo
59eac5ca55 Merge pull request #34983 from tgstation/Cyberboss-patch-1
Removes /New() from landmarks
2018-01-28 15:08:25 -06:00
ShizCalev
e53dbbc2ec Removes landmark tag generation (#34927) 2018-01-26 11:22:22 -06:00
ShizCalev
6ed56158e3 Adds new landmark icons (#34848)
* Adds new landmark icons

* Update

* Blue
2018-01-24 18:08:33 -06:00
coiax
d7c317b6d0 Abstract landmarks are now indestructible (#34808)
In situations where a maxcap has been dropped above the Bridge, which is
generally the Observer-Start landmark's location, it would destroy the
landmark, making observers get a debugging message asking them to ahelp
when they observed.

There should be a better way of making an object indestructible from any
ingame effect without having to make it QDEL_HINT_LETMELIVE...
2018-01-24 06:12:57 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
Jordan Brown
20014e6f44 Merge pull request #33075 from AnturK/itsnotabusewhenitsassistants
Adds spawn override system
2017-11-25 16:37:46 -06:00