Commit Graph

117 Commits

Author SHA1 Message Date
evilew 10ef9e374a Nanotrasen to GATO - comments
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
evilew edea3ae8e0 nanotrasen to gato
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01:00
SandPoot 8516b07eee please do not end your paths with / 2024-03-13 14:43:40 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 11aa13e4e8 part 1 - 41928 2023-07-26 21:45:43 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
Sakura 08b38a7e70 Ashwalker Update (#15466)
* Ashwalker Update

* Update generic_positive_events.dm

* Update ashwalker.dm

* fixing newlines

* Update code/modules/antagonists/_common/antag_datum.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* literally 1984

* unlimiting spawns

* Create antag_datum.dm.bak

* Revert "Create antag_datum.dm.bak"

This reverts commit d91e1f4c4d9c86bc4a275ef19f45e8927dd93cae.

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-02-03 19:34:15 -08:00
keronshb 9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
keronshb 8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
keronshb 29a01f2d05 Antag Info and fixing the handshake finally 2021-10-14 20:43:41 -04:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
Putnam3145 cd9b5fb7d8 Makes special objective items delete on reroll 2021-09-14 14:34:41 -07:00
Putnam 4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
Letter N 42c04ea087 solarss 2021-03-12 12:28:19 +08:00
Letter N 935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
DeltaFire e24eb14121 args
these are needed for the CI not to fail, even if unused in most cases.
2021-01-20 16:32:15 +01:00
Timothy Teakettle 4afceebcc1 critical 2020-10-20 02:11:08 +01:00
DeltaFire15 1e1a92983a [s] Objective fixes : Cryo edition (#13561)
* no more free wins from cryo

* Kicks travis with an empty commit

* Update code/game/gamemodes/objective.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-10-15 12:44:08 +02:00
silicons f653fd5c3c kay 2020-07-15 14:58:51 -07:00
DeltaFire eeadc9a0e7 fixes the kill once objective
the target being afk / disconnecting is now only accepted at roundend, and doesn't lead to it being regarded as permanently completed midround.
2020-07-06 23:00:36 +02:00
Putnam 87dd2681ca The locate isn't necessary 2020-04-16 08:30:55 -07:00
Putnam 368d801940 Makes objectives clean theirselves up properly. 2020-04-16 08:17:48 -07:00
Putnam3145 658701bf37 Various ghost role QoL; moving holding facility; removing energy net (#11676)
* Removed gay baby jail net from ninja

* Made a proper holding facility for syndicate contractors

* Made ghost role eligibility able to allow reghosting.

* Added a medibot to the holding facility.

* Added new comsigs to every other ghost proc

* Properly dummied out capture objective
2020-03-31 22:04:55 +02:00
Kraseo f8a365490b FUCK² 2020-03-14 13:15:09 +01:00
Kraseo 3f44882c1a FUCK 2020-03-14 13:13:26 +01:00
Kraseo a2592483b5 hey did you know there's not one, not two, but three tiles on roid7.dmm that don't have /area/ruin/space but rather /area/ruin/unpowered? yeah i'm angry too 2020-03-14 13:07:13 +01:00
Kraseo a5ef41c0fc adjust numbers, fix shuttle dropoffs 2020-03-07 20:31:49 +01:00
Kraseo 4ac2848282 fixes contract target blacklisting 2020-03-04 12:35:36 +01:00
Kraseo e3c77f2f5a part 4: the one where i slowly go insane 2020-03-01 22:05:35 +01:00
Kraseo ab48a6fa16 part 3: do people even read commit logs 2020-03-01 19:14:05 +01:00
Kraseo d93ade7e03 part 2: bloody tendency 2020-03-01 17:37:18 +01:00
Kraseo 38f7821dd6 part 1: battle stream 2020-03-01 16:56:13 +01:00
kevinz000 2dd5a0cfb8 Merge branch 'master' into hijack 2020-02-19 22:25:31 -07:00
Putnam a9edff6e56 Supermatter sabotage no longer shows up with no supermatter 2020-02-18 11:51:03 -08:00
Putnam 88ce25a09b hopefully fixing the once-assassin 2020-02-03 08:10:45 -08:00
Putnam 53cad493a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul 2020-02-03 03:17:23 -08:00
Putnam e812844c70 Revert "</span>"
This reverts commit d6d01d848c.
2020-02-01 21:05:27 -08:00
Putnam d6d01d848c </span> 2020-02-01 06:01:54 -08:00
Putnam 50a53c6558 aaand a formatting oddity 2020-02-01 00:47:44 -08:00
Putnam 425f532f76 WHOOPS 2020-01-31 13:12:50 -08:00
Putnam 809f57a15d also added kill-once objectives 2020-01-31 12:25:19 -08:00
Putnam d358913bde linter is right, whoops 2020-01-28 17:26:32 -08:00
Putnam 8df9a051ec it compiles now, ready for testmerge probs 2020-01-27 19:09:04 -08:00
Putnam 233aeaa456 removed some suggested bad possible contraband 2020-01-26 19:03:09 -08:00
Putnam 37777c4cc7 Removed the wirecutting one 2020-01-25 13:37:40 -08:00
Ghommie 856ef236f3 Further runtime fixes by AnturK. 2020-01-24 23:01:30 +01:00
Putnam c58b4daa35 collectors too
this doesn't compile but like. it's a draft
2020-01-24 11:58:58 -08:00
Putnam 847b3c0a09 Fixed flavor objectives and added more. 2020-01-24 10:46:07 -08:00