shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,198 Commits 5 Branches 0 Tags
ebf652f736c302c4a7e7aaea8b0912fc30bb0fc0
Commit Graph

615 Commits

Author SHA1 Message Date
silicons
74e26f7a0c Merge pull request #14436 from Putnam3145/supermatter-surge-rebalance 
Buffed supermatter surge to make it up to 50x as strong as before.
 2021-03-20 14:29:40 -06:00
DeltaFire
f99c17012c removes jars from techweb 2021-03-15 22:26:05 +01:00
DeltaFire
039a337842 Merge pull request #14416 from GrayRachnid/abductors-more-players 
Adjusts the abductors event to only trigger when there's 30 players.
 2021-03-15 17:02:33 +01:00
Putnam
9a3e1d0307 wow that's REALLY REALLY BAD 2021-03-14 19:02:44 -07:00
Putnam
c9923f7e47 Tweaks supernova to not be inconsequential as often 2021-03-14 15:31:05 -07:00
Putnam
c8c3320789 Buffed supermatter surge 50x. 2021-03-14 15:17:47 -07:00
GrayRachnid
510ec3568b Makes it so abductors require 30 players to trigger 2021-03-11 18:16:49 -05:00
silicons
939a493334 Merge pull request #14306 from Putnam3145/supernova 
Adds a supernova event, with tweaks to allow this
 2021-03-10 01:32:52 -07:00
Letter N
22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
silicons
4fdaf10049 Merge pull request #14359 from Hatterhat/traumannounce 
funny trauma announce
 2021-03-06 17:00:10 -07:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Hatterhat
c02cf7d551 funny trauma announce 2021-03-02 22:35:08 -06:00
Putnam
291fc2add6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into supernova 2021-03-02 01:33:22 -08:00
Putnam
38fb75c235 Prevents bloodsucker daytime-soon spam 2021-03-02 01:20:22 -08:00
silicons
3d417167c6 Merge pull request #14307 from Putnam3145/supermatter-events 
Adds a new event: supermatter surge
 2021-03-01 18:27:51 -07:00
Putnam
b2388c0f08 Removes auto-matchmaking from valentines event 2021-02-25 23:11:40 -08:00
Putnam
526105ffd6 Made it not announce 100% of the time 2021-02-24 03:35:30 -08:00
Putnam
04b5ee0b16 Adds a new event: "supermatter surge" 2021-02-24 03:29:19 -08:00
Putnam
23eaf250a9 Make sure to hit the funny tick 2021-02-24 03:12:01 -08:00
Putnam
311d766bd5 Adds a supernova event, with tweaks to allow this 2021-02-24 02:56:14 -08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing 
Tool behavior replacing
 2021-02-21 14:48:50 -07:00
Letter N
7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
silicons
293404f728 Merge pull request #14258 from IronEleven/IronEleven-patch-1 
Raises Space Vine Population Requirement
 2021-02-20 03:02:24 -07:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Hatterhat
6d28c27f36 aoaoaoaooaoa 2021-02-17 23:24:44 -06:00
IronEleven
7ff8b41874 Update spacevine.dm 2021-02-16 09:14:27 -05:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
Putnam
5c7ddaeedd Makes nightmare dynamic-controlled 2020-12-17 23:43:17 -08:00
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
silicons
e89e7da2fd Update xmas.dm 2020-12-13 18:55:07 -07:00
Putnam
c5e410c1bc Makes spontaneous brain trauma require min 5 players. 2020-11-22 00:12:54 -08:00
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines 
Adds missing EOF newlines
 2020-11-18 17:50:38 -08:00
DeltaFire
3e19557e8f and more fixes. 2020-11-14 19:38:39 +01:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
MrJWhit
c1aad0fa27 Update _event.dm 2020-11-04 16:43:44 -05:00
silicons
57677183d3 Update anomaly.dm (#13629) 2020-11-01 22:01:57 +01:00
DeltaFire15
91584053f5 Fixes a bunch of fallout from the tgui PR (#13648) 
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
 2020-11-01 21:59:22 +01:00
Timothy Teakettle
861f225f2d trader fix 2020-10-18 03:25:17 +01:00
DeltaFire
9990337f32 fixes a bunch of portal runtimes 
Ah yes lets just change the basic portal generation proc but not change the actual calls to it for the most part, what could go wrong?!
 2020-10-10 23:40:12 +02: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
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
Putnam
6f6e330984 Removes removeNullsFromList, cause it doesn't work. 2020-09-24 01:15:22 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00