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

45021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
keronshb
bd7a2b6a2a Lets families compile 2021-10-12 16:12:38 -04:00
keronshb
d88933b492 Families wanted stars now only show up when you are involved in it, and announcements for wanted level changes (#50283) 
* Wanted level stuff

* fuck

* Update code/game/gamemodes/gang/gang.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/_onclick/hud/families.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/game/gamemodes/gang/gang.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/antagonists/gang/gang.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/antagonists/ert/ert.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
 2021-10-12 14:03:33 -04:00
keronshb
41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
keronshb
0bae06adcd Original Port 2021-10-11 22:00:54 -04:00
keronshb
408317fae0 Merge remote-tracking branch 'upstream/master' 2021-10-11 20:28:24 -04:00
Putnam3145
b6fdf671f1 Merge pull request #15215 from silicons/afk_tracking 
fixes afk detection
 2021-10-11 15:52:03 -07:00
Putnam3145
3209917830 Merge pull request #15173 from silicons/vpn_block 
adds PANIC_BUNKER_LIVING_VPN option (READ, THIS IS NOT A VPN BAN)
 2021-10-11 15:51:52 -07:00
Putnam3145
83ebebaa05 Merge pull request #14890 from Citadel-Station-13/silicons-patch-44 
[experimental] changes to slowdown scaling
 2021-10-11 15:51:33 -07:00
silicons
f3e7929cb4 Merge pull request #15230 from Putnam3145/auxmos-update 
Updates auxmos to latest
 2021-10-11 15:50:03 -07:00
Changelogs
41b9ef2180 Automatic changelog compile [ci skip] 2021-10-11 00:28:25 +00:00
Timothy Teakettle
11df2bb77c fixes emps not working on lockers (#15259) 
* Update closets.dm

* Update code/game/objects/structures/crates_lockers/closets.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-10-11 00:48:00 +02:00
silicons
84c6970c27 Merge pull request #15250 from SandPoot/you-are-now-rate-limited 
You are now rate limited
 2021-10-09 22:14:45 -07:00
silicons
7c311f9730 Merge pull request #15251 from UncleBourbon/i-love-coding 
Adds Neo-Kanji language to roundstart language and space ninja
 2021-10-09 22:14:26 -07:00
keronshb
b9ed852438 Merge remote-tracking branch 'upstream/master' 2021-10-09 11:58:24 -04:00
Lin
2085279590 Merge pull request #15252 from SandPoot/tooltip-related-fixes 
Tooltip related fixes
 2021-10-08 22:31:23 -07:00
keronshb
beab6771bb Merge remote-tracking branch 'upstream/master' 2021-10-09 00:29:13 -04:00
keronshb
fce4eb0476 Merge branch 'dynamicport' 2021-10-09 00:28:30 -04:00
silicons
a7fe6f0cfd Merge pull request #15255 from Hatterhat/saiga-fix 
unsuperglues the warden's CCS stock
 2021-10-08 20:57:30 -07:00
silicons
8cec112f65 Merge pull request #15257 from DeltaFire15/undocumented-pirate-revert 
Reverts an undocumented change to pirate payoff minimum cost from the dynamic PR
 2021-10-08 20:50:48 -07:00
Changelogs
88836ea499 Automatic changelog compile [ci skip] 2021-10-09 00:25:57 +00:00
DeltaFire
c5476daeec revert 2021-10-08 23:51:34 +02:00
Hatterhat
20087a06a8 superglued stock 2021-10-08 00:15:35 -05:00
keronshb
ea4401940d Merge remote-tracking branch 'upstream/master' 2021-10-07 21:52:51 -04:00
Putnam3145
3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport 
(Probably ready for test merge) DYNAMIC 2021
 2021-10-07 18:14:59 -07:00
Lin
b92226be17 Merge pull request #15245 from Putnam3145/fix-ashwalkers-one-last-time 
Another lavaland breathing fix
 2021-10-07 11:44:47 -07:00
Lin
db0e331d45 Merge pull request #15225 from silicons/admin_ahelp_irc 
ahelps now go to irc regardless of admin count
 2021-10-07 11:40:33 -07:00
keronshb
5c562959a9 Allows midround budget to be spent in extended 2021-10-07 14:12:37 -04:00
SandPoot
3de08a74e7 Upload files 2021-10-07 12:32:20 -03:00
Cazz
9805224ede adds neo kanji language 2021-10-07 02:53:08 -05:00
Putnam3145
fedf409a5d Merge pull request #15105 from Citadel-Station-13/silicons-patch-7 
comedically controversial stunbaton """"buff""""
 2021-10-07 00:05:45 -07:00
Putnam3145
8be5dba86a Merge pull request #15127 from Citadel-Station-13/silicons-patch-14 
chaplain runspeed holy weapon will now only give a random slowdown/speedup of 6 tiles which for the most part ignores all other slowdowns/speedups, instead of randomizing between slowing to a crawl and running faster than the speed of light
 2021-10-07 00:05:24 -07:00
Putnam3145
ac84eed0d1 Merge pull request #15129 from Citadel-Station-13/silicons-patch-15 
if you recognize this is not the way to do it, don't do it (bandaid to polychromatic loadout lookup)
 2021-10-07 00:05:06 -07:00
Changelogs
6cb639638e Automatic changelog compile [ci skip] 2021-10-07 00:27:18 +00:00
SandPoot
e88368cd4c Update fail2topic.dm 2021-10-06 16:27:06 -03:00
SandPoot
39e63d5ac8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-06 14:49:27 -03:00
keronshb
5451e5d4d7 Space Dragon gust no longer hardstuns. (#15243) 
* Removes hardstun

* oops adds the disarm
 2021-10-06 17:30:13 +02:00
Chayse Ramsay
d1611ddf42 Lavaland ruin rad storm fix (#15242) 
* Lavaland rad storm fix

* whoops

* double whoops

* Update Lavaland.dmm
 2021-10-06 17:28:29 +02:00
Tupinambis
383f4423ac Why can't xenos eat rats and stuff. This fixes that. (#15227) 2021-10-06 17:19:59 +02:00
Chayse Ramsay
76fa85e683 Cyborg module sorting fixed (#15241) 2021-10-06 17:16:10 +02:00
Putnam3145
8070df6492 whoops 2021-10-05 19:07:52 -07:00
Changelogs
fa4f6dc612 Automatic changelog compile [ci skip] 2021-10-06 00:27:55 +00:00
Lin
3f50e836cc Merge pull request #15238 from DeltaFire15/nanitedefibs 
Nanite defibs now heal oxygen damage akin to defibs, also adds the revival memory policy to them
 2021-10-05 16:25:59 -07:00
Lin
8f9a2b6d0c Merge pull request #15235 from silicons/pai_radio_Stuff 
redoes how pai emp silencing works
 2021-10-05 12:32:23 -07:00
Lin
88db62f03f Merge pull request #15239 from jakeramsay007/7.12x82mm-Fix 
7.12x82mm Match Ammo box sprite fixed
 2021-10-05 12:21:10 -07:00
Lin
1b8c72285f Merge pull request #15236 from silicons/decon 
fixes computer boards disappearing on decon
 2021-10-05 12:14:00 -07:00
Lin
526e771e27 Merge pull request #15240 from jakeramsay007/Fix-15193 
Advanced retractor sprite fix
 2021-10-05 12:12:51 -07:00
silicons
73d6266f89 fix (#15248) 2021-10-05 19:42:26 +02:00
Lin
b18fbe695a Merge pull request #15233 from SandPoot/misc-fixes 
Some random fixes
 2021-10-05 10:27:19 -07:00
Lin
d10fa48e29 Merge pull request #15237 from DeltaFire15/phobia-redtext 
Fixes phobias just deleting trigger words, also highlights all of them
 2021-10-05 10:22:17 -07:00
Putnam3145
51f85c58a4 One last ashwalker fix 2021-10-04 20:56:08 -07:00