Commit Graph

475 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 27bdd4b732 aiModule > ai_module 2023-12-17 23:20:43 -03:00
zerothebigboy 091d9ec00f good 2023-01-30 00:01:22 -05:00
shellspeed1 d9e15776ee Ports the RBMK reactor from both NSV using Hyper and Splurt code (WIP) (#15847)
* sprites and sounds

* The code for the reactor itself

* Update code/modules/power/reactor/rbmk.dm

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

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Map stuff

* Removes Clamps.

* Matrices separated, this was a mistake on my part.

* Update tgstation.dme

* removal as per putnam's review

* redfines highest available as 1007

* possible soundloop fix? probably not.

* temporary config thing to make engine load

* changes to map template from splurt

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* actually somehow fixed the runtimes?

* old maps from hyper, not needed..

* Revert "old maps from hyper, not needed.."

This reverts commit 92ccd89952d360206926d8b57e82084994a6a0d6.

* take two on removal

* fixes power output

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* deals with the double turf

* Revert "temporary config thing to make engine load"

This reverts commit 7f52188d5261cd60024ef36cf7c33df0748d0c79.

* was told to bring it back

* don't need to change these

* next time I'll just copy paste it instead of type it.

* a

* Flexi Seal crate so we can fix the reactor

* set power to 0 so it can be fixed

* nerfs power output

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2022-09-17 13:33:51 -07:00
Hatterhat 2155a8bdce funny ammo 2022-08-03 06:11:04 -05:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
LetterN 99019166e4 i think it works
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
zeroisthebiggay 662807042d Update uplink_dangerous.dm 2021-09-23 22:14:09 -04:00
silicons 4af82878dc Update uplink_ammo.dm (#15141) 2021-09-14 02:24:37 +02:00
zerothebigboy 30134a0d2f cool 2021-09-01 06:32:33 -04:00
silicons 996a99b7f4 Merge pull request #14759 from Arturlang/uplink_misc_item_rebalances
Changes the cost of the holoparasite injector and the ricochet eyepatch
2021-06-09 11:21:12 -07:00
silicons 716c2a04e4 Merge pull request #14160 from keronshb/motivation
Adds a new traitor item, Motivation (Part 1)
2021-06-09 11:10:17 -07:00
Arturlang 71a8c08e22 A lil more 2021-05-26 18:40:59 +03:00
Artur 673a322cbb changes cost of two uplink items 2021-05-26 18:29:18 +03:00
silicons eba3f554bc Merge pull request #14737 from zeroisthebiggay/KILL
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
2021-05-23 08:52:25 -06:00
keronshb 99a94e2b3a Contractor poplock to 25
Title
2021-05-19 21:53:14 -04:00
zerothebigboy fff719c408 KILL 2021-05-18 18:47:12 -04:00
zeroisthebiggay 040bcb155a Update uplink_stealth.dm 2021-05-13 05:03:09 -04:00
silicons 4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
2021-05-07 18:42:24 -06:00
Bapldap aefa9eb292 lesspopcrates
less population required for surplus crates, everyone loves them. I don't see how this could affect gameplay in any negative way :)
2021-05-01 22:31:24 -05:00
silicons d4529b1bf3 Merge pull request #14651 from WanderingFox95/WanderingFox95-ReagentDartgunRebalance
The reagent dart gun uplink item needed work.
2021-04-28 21:17:36 -06:00
WanderingFox95 bda2865530 Made the description actually describe the limitaitons 2021-04-23 23:24:41 +02:00
WanderingFox95 35269554bb Adjusts TC cost
Shouldn't be over half your TC, if the Dart Pistol is only 2 TC and infinitely more useful under non-role restricted circumstances
2021-04-23 23:18:13 +02:00
The0bserver 6b4051071d Finally, ammo for the funny gun. 2021-04-21 10:46:04 -04:00
The0bserver db046f3dbb I want to play Thermonuclear War (Initial Commit) 2021-04-21 03:12:01 -04:00
silicons 9f032df236 Merge pull request #14608 from TheObserver-sys/TheHoldoutUpdate
The Holdout Update: How I learned to stop whining, and aim a pocket pistol.
2021-04-18 18:50:37 -06:00
silicons e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06:00
silicons 02f4bd8f3a Merge pull request #14591 from zeroisthebiggay/deathrattles
ports deathrattle implants but without mob statchange because i am not gonna port that today
2021-04-18 18:48:08 -06:00
keronshb 20c190c17d Merge remote-tracking branch 'upstream/master' into motivation 2021-04-14 17:55:24 -04:00
Putnam 4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
The0bserver c390b5b6e4 a fix for a fox 2021-04-11 20:27:48 -04:00
The0bserver 9fe8fb7671 More work 2021-04-11 07:20:06 -04:00
The0bserver e75088420d Error fixing. 2021-04-11 04:38:46 -04:00
The0bserver 55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
zerothebigboy a7c061392b i hate tg code 2021-04-08 18:05:36 -04:00
Eric 7d19991765 Update uplink_stealth.dm
Adds Telescopic Bat to uplink
2021-03-28 22:35:26 -05:00
GrayRachnid 69abd3ac9a removes illegal tech from a few common items that can be found in space/gateway exploration 2021-03-12 17:31:54 -05:00
silicons 178fe9cf55 Merge pull request #14253 from keronshb/eutactic_blade_restoration
Hyperblade restored to uplink
2021-02-22 13:10:21 -07:00
keronshb eb3299e969 Removes Dragon Tooth
Why bother
2021-02-22 13:54:53 -05:00
silicons e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
2021-02-17 01:30:13 -07:00
keronshb d87ac38e58 Eutactic Blade Restoration + Hyperblade
Brings the Eutatic Blade back to the traitor uplink, same for the Hyperblade.
2021-02-15 21:36:47 -05:00
keronshb 41530110a2 LINTER
AHHHH NEW LINE
2021-02-10 20:00:17 -05:00
Lin fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
SmArtKar 6c92e99899 desc 2021-02-04 22:13:59 +03:00
SmArtKar 24619344f5 Traitor/nuke ops cards no longer count as real cards in binders(they are cheap knock-offs like come on nobody will believe that its a real card) 2021-02-04 19:08:35 +03:00
SmArtKar 2135a391dc More cards? More cards! 2021-02-04 19:03:03 +03:00
SmArtKar 2cd339f776 Adds Card Ops bundle 2021-02-04 18:57:00 +03:00