shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,054 Commits 5 Branches 0 Tags
10ef9e374ad136facb224e8d8b678dd6a985e5fa
Commit Graph

221 Commits

Author SHA1 Message Date
evilew
42c59d3506 NT to GT 
Changed most instances of NT (Nanotranse) to GT (GATO). Left alone stuff that makes sense for it to be NT branded
 2024-11-09 23:11:05 +01:00
SandPoot
c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot
676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
SandPoot
a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot
c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot
40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot
2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00: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
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
Solaris-Shade
48db01702b Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-06 22:31:51 -04:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
Solaris-Shade
2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update 
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
 2022-03-06 15:20:23 -05:00
silicons
ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
silicons
af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460) 
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
 2022-02-07 15:17:24 -08: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
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08: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
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
zerothebigboy
e0a311435b thetwentysecondofmany 2021-06-11 20:53:35 -04:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +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
silicons
596d0687d9 Update necropolis_gate.dm 2021-03-08 19:16:23 -07:00
silicons
66874fe252 Merge pull request #14083 from shellspeed1/alternative-xeno-hive 
Removes the queen, and increases xeno variety in lavaland xenomorph ruin.
 2021-01-20 15:22:06 -07:00
shellspeed1
c89341227c Adds more dead xeno subtypes for mapping 2021-01-17 18:01:24 -08:00
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
Timothy Teakettle
08d2b0bc17 Update code/modules/ruins/objects_and_mobs/sin_ruins.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-01-10 23:41:52 +00:00
timothyteakettle
99b26c08be Update sin_ruins.dm 2021-01-10 01:56:18 +00:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
EmeraldSundisk
852bc21567 Update skelter.dm 2020-10-02 21:02:31 -07:00
EmeraldSundisk
fdb0293a50 cloner note 2020-10-02 13:34:10 -07:00
Putnam
c8f947011f Makes ghost dojo hilbert hotel not easily enterable. 2020-08-31 05:43:56 -07:00
silicons
188bb13272 Merge pull request #13181 from Putnam3145/dynnamic 
Dynamic: tweaks and fixes: the reckoning
 2020-08-22 15:22:19 -07:00
Lin
d287f44d9a Merge pull request #13045 from silicons/coggers 
ports bronze (fake clockwork) airlocks and windows
 2020-08-16 20:20:03 -05:00
Putnam
f54d272b11 Yet more dynamic tweaks. 2020-08-15 23:38:21 -07:00
silicons
815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N
10fefca674 another batch. MAJOR: chem_master, pandemic 2020-07-30 14:06:20 +08:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
Artur
3c973816d1 Ports https://github.com/tgstation/tgstation/pull/51125/ 2020-05-27 12:48:25 +03:00