shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,219 Commits 5 Branches 0 Tags
fd286c325ee136e595ffd5dfbfdb229936d02bb7
Commit Graph

1579 Commits

Author SHA1 Message Date
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00: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
8cfb7a1bf4 They no longer snap south! 2022-03-24 01:03:42 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
11daaadf79 arguments. 2022-03-18 18:43:40 -03:00
SandPoot
16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-Shade
0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade
171bd18c8a Updated Projectile code some more. 2022-03-11 22:23:01 -05:00
Solaris-Shade
c5be81c589 tg moved projectiles out of /item, added '/item' back 2022-03-06 16:29:58 -05: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
SandPoot
21b68944e7 Upload files 2022-03-05 16:00:12 -03:00
SandPoot
6c347a9186 Fixes targets (#15521) 
* Automatic changelog compile [ci skip]

* Update files

Co-authored-by: Changelogs <action@github.com>
 2022-02-22 15:50:32 -07:00
Putnam3145
a49b19a4f7 makes reinforced plasma glass windows buildable 2022-02-19 19:14:48 -08: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
SpiWat
386a7480a7 Tweenty -> Twenty 
Spelling.
 2022-01-31 19:12:00 -05:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
SandPoot
8510dcc08a Ports tgui stripping (finally) (#15401) 
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
 2021-12-30 07:40:15 +01:00
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
Linzolle
afe81f711b Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball 2021-11-26 18:46:57 -07:00
Lin
d5c17f0d84 Merge pull request #15376 from SandPoot/double 
Double beds
 2021-11-24 17:38:10 +00:00
Lin
e3a5391250 Merge pull request #14868 from Arturlang/admin_mapsave 
buildmode mapgen tool save [ready]
 2021-11-24 17:32:48 +00:00
LetterN
8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
keronshb
af83fb9611 FestiveMap 2021 2021-11-20 12:04:35 -05:00
Artur
99dedb54ed Merge remote-tracking branch 'upstream/master' into admin_mapsave 2021-11-20 00:16:56 +02:00
MrJWhit
47cf0c153a Update loot_pile.dm 2021-11-17 18:36:49 -05:00
Lin
efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021 
Spookystation (Ball Map) and Vector Cars
 2021-11-17 16:26:07 +00:00
LetterN
fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
SandPoot
ca3eaca314 update bedsheet_bin.dm 2021-11-15 20:48:11 -03:00
SandPoot
5b85c260a7 Upload files 2021-11-15 01:34:30 -03:00
DeltaFire
6224da71a3 contents_explosion 
at least this one had less overrides.
 2021-11-14 21:41:42 +01: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
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
keronshb
0aceecee2e w hitsound 2021-11-10 16:49:18 -05:00
keronshb
efd12e4fd5 Changes for merge 2021-11-01 12:07:44 -04:00
Lin
b6ad2f6a6b Merge pull request #15312 from keronshb/evergreen 
The grinch can no longer steal Christmas.
 2021-10-30 14:08:59 -07:00
LetterN
1fc778f70a soundloop fix. also it gets deleted (woo) 2021-10-30 13:16:31 +08:00
LetterN
a057139c33 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-10-30 11:54:20 +08: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
silicons
319c5e23fe Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not 
Revert "TGUI alerts, lists, inputs"
 2021-10-29 20:27:46 -07:00
Lin
5054ea87ce Merge pull request #15310 from keronshb/jaqincinerator 
No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
 2021-10-28 21:29:50 -07:00
keronshb
e531c7b452 Fix 2021-10-28 18:48:26 -04:00
keronshb
6dcf4fae9f No stealing christmas 2021-10-28 11:28:59 -04:00
LetterN
f7b898a2a9 frontend 2021-10-28 17:34:52 +08:00
keronshb
e8c56c07ee No burning the spirit of halloween 2021-10-28 00:43:02 -04:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
Artur
bfcdf83e55 buildmode mapgen tool save 2021-10-26 16:31:36 +03:00