shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,382 Commits 5 Branches 0 Tags
a47a20235ffdb42e31d4d1b472e2bed9273d3939
Commit Graph

9977 Commits

Author SHA1 Message Date
LetterN
8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
Lin
1de965a90e Merge pull request #15385 from buffyuwu/crayons.dm 
dont color my entire canvas neon green when im painting please
 2021-11-20 03:36:38 +00:00
Lin
d395824007 Merge pull request #15383 from MrJWhit/thinnining-trash 
Thins up the loot piles
 2021-11-20 03:35:56 +00:00
Lin
43e4c71d04 Merge pull request #15384 from SandPoot/acid-bgone 
Acid overlay no longer lingers after done
 2021-11-19 23:02:49 +00:00
Putnam3145
cf4cc39a3b Merge pull request #15222 from raspy-on-osu/apcfix 
save hours of pain for new engineers with this one simple trick!! click here to find out
 2021-11-18 20:18:11 -08:00
buffyuwu
612087f7e5 Update crayons.dm 2021-11-18 20:44:01 -05:00
SandPoot
9d3857c94e Upload files 2021-11-18 14:57:19 -03: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
Lin
4e407ffeb6 Merge pull request #15371 from DeltaFire15/unintended-devastation 
Devastation level explosions no longer delete organs of gibbed humans
 2021-11-17 16:19:23 +00:00
LetterN
fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
DeltaFire
0e93bd84f8 no funky relay decon and wackyness 2021-11-16 02:22:12 +01:00
LetterN
cca584b2df should finally fix dragging other people into cryo 2021-11-16 08:37:48 +08:00
LetterN
01ebc25f7f fixes vending BSOD and reverts cryopod regressio 2021-11-15 10:37:10 +08:00
DeltaFire
3f9ad6a954 should do this instead 2021-11-14 22:44:43 +01:00
DeltaFire
50c7d4914f reebe loading (woo) 2021-11-14 22:25:39 +01:00
DeltaFire
88789e1bbe one 2021-11-14 22:06:52 +01: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
DeltaFire
7d2ff194d1 this WILL fail CI 
hnnnngh
 2021-11-14 20:48:41 +01:00
LetterN
eb98848a9f wires this code to the PROPER prefs 2021-11-14 09:23:08 +08:00
Lin
91adaf84b6 Merge pull request #15330 from keronshb/dynamiclog 
Dynamic messages admins if it fails to hijack.
 2021-11-13 04:50:43 +00:00
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
LetterN
4ec1f216ff cryofix 2021-11-12 08:48:24 +08:00
Putnam3145
7df63ed6f5 Nerf chonker/temper 2021-11-10 16:20:43 -08:00
keronshb
0aceecee2e w hitsound 2021-11-10 16:49:18 -05:00
LetterN
9a24f89780 THE fix 2021-11-10 10:33:15 +08:00
silicons
5b5eca2beb Merge pull request #15322 from SandPoot/crayon-precision 
Crayon precision mode
 2021-11-09 09:56:03 -08:00
Putnam3145
b7b69fdeda Fixes power alarm not to be precisely wrong 2021-11-07 09:27:13 -08:00
Putnam3145
b2459a26a3 Merge pull request #15306 from keronshb/dynamicadjustments 
Adjusts Dynamic requirements to be more lienent (less 24/7 traitor and maybe a chance for something else holy shit)
 2021-11-04 16:27:58 -07:00
Lin
74c6e05dd7 Merge pull request #15318 from silicons/evil 
removes some evil defines from the code
 2021-11-04 04:32:48 +00:00
keronshb
e20b5f7c92 Dynamicadmins 
Messages admins if dynamic fails to hijack
 2021-11-03 22:39:20 -04:00
keronshb
efd12e4fd5 Changes for merge 2021-11-01 12:07:44 -04:00
SandPoot
d92a290960 Update crayons.dm 2021-11-01 01:50:30 -03:00
SandPoot
05717c7ae3 Upload files 2021-11-01 01:24:47 -03: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
keronshb
b58d3f14a3 More adjustments 2021-10-30 10:24:58 -04:00
LetterN
f9ce0759a3 indentation moment 2021-10-30 14:25:44 +08:00
LetterN
89f7cf1c32 i apparently didnt commit this? 2021-10-30 13:46:54 +08:00
silicons
a32eabb7ae fix 2021-10-29 22:44:01 -07:00
LetterN
1fc778f70a soundloop fix. also it gets deleted (woo) 2021-10-30 13:16:31 +08:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
LetterN
ec85d5575d sus login 2021-10-30 12:23:35 +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
133225c083 Removes required enemies 2021-10-28 23:48:50 -04:00
keronshb
02eb4685a9 Some adjustments 2021-10-28 23:44:02 -04:00
keronshb
e531c7b452 Fix 2021-10-28 18:48:26 -04:00