shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,690 Commits 5 Branches 0 Tags
291fc2add6393ae3205360922aeac8c29595eb2b
Commit Graph

18297 Commits

Author SHA1 Message Date
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
1d8533c1cd Merge pull request #14324 from dzahlus/ash-drake-transform-powergaming 
Changes to ash drake transformation
 2021-03-01 18:42:28 -07:00
dzahlus
ca1fe9d6c0 Update shapeshift.dm 
for keb
 2021-03-02 02:40:23 +01:00
silicons
b5bb90ecf8 Merge pull request #14290 from SandPoot/properlegioninheritance 
Legions pass their type to the mob they infect
 2021-03-01 18:35:37 -07:00
silicons
7af3c986ad Merge pull request #14328 from R3dtail/patch-3 
Makes Clownification Less Abysmal :honk:
 2021-03-01 18:32:29 -07:00
silicons
6c6ebb3002 Merge pull request #14342 from MarinaGryphon/patch-1 
Fixes #14341
 2021-03-01 18:31:25 -07:00
silicons
dea79157dd Merge pull request #14295 from Putnam3145/fusion 
Removes open-air fusion completely.
 2021-03-01 18:30:27 -07: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
silicons
0612451aef Merge pull request #14320 from Putnam3145/valentine-removal 
Removes auto-matchmaking from valentine's event
 2021-03-01 18:27:07 -07:00
silicons
c23db5daee Merge pull request #14327 from qweq12yt/pacifist-zombo-fix 
fixes pacifist zombies
 2021-03-01 18:26:16 -07:00
dzahlus
f206213603 60 second cooldown instead of 3 minutes 2021-03-01 22:16:23 +01:00
Lin
8919a8bb99 Merge pull request #14338 from Citadel-Station-13/silicons-patch-1 
fixes florarevolution runtime when hitting hydrotrays
 2021-03-01 14:15:31 -06:00
silicons
25a9f80c36 Merge pull request #14334 from SandPoot/this-proc-can't-be-split 
Cannot modify null.real_name
 2021-02-28 22:49:30 -07:00
silicons
638b6d05ac Merge pull request #14333 from Detective-Google/hamburger 
departmental-ish turtlenecks
 2021-02-28 22:49:09 -07:00
MarinaGryphon
cc0f79f772 Fixes #14341 2021-02-28 19:05:10 -06:00
silicons
e36f148014 Merge pull request #14293 from SmArtKar/tcg_gaming 
[READY] TCG fixes
 2021-02-28 01:26:56 -07:00
silicons
2bcf05ee22 Update hydroponics.dm 2021-02-28 01:23:37 -07:00
Lin
ec2ca7985d Merge pull request #14311 from SandPoot/body-rejuv-buff 
Body rejuvenation automatically repeats until completely healed
 2021-02-27 17:13:16 -06:00
qweq12yt
d89bc85ae7 oops forgot a "/" 
it could happen to anyone
 2021-02-27 19:26:29 -03:00
qweq12yt
6d5afe146c restores any removed quirks when unchanging 2021-02-27 19:17:12 -03:00
Lin
41f227bc5e Merge pull request #14321 from Putnam3145/windbreaker-fix 
Makes polychromic windbreaker's message not be nonsense
 2021-02-27 14:43:35 -06:00
Lin
4cd12649d2 Merge pull request #14325 from dzahlus/slime-fix 
Fixes toxin healing for slimes in heretic related stuff
 2021-02-27 14:41:33 -06:00
SandPoot
b3c2f52358 Update transform_procs.dm 2021-02-27 15:57:04 -03:00
qweq12yt
d8d2a5d4c4 using quirk susbsysten instead of trats 2021-02-27 15:56:44 -03:00
SandPoot
0952777c56 upload transform_procs.dm 2021-02-27 15:53:17 -03:00
Detective Google
0d2eef3cc4 for everyone 2021-02-27 04:45:23 -06:00
Detective Google
2ae258d002 turtlenecks 2021-02-27 04:42:05 -06:00
qweq12yt
04d478bb20 turning removes pacifism 2021-02-27 01:49:56 -03:00
R3dtail
af4b8ef0c5 Update vorepanel.dm 
Made it uniform with the maximum characters allowed for emotes because uniformity is nice.
 2021-02-26 19:36:44 -06:00
R3dtail
ccdfbbdc04 I'm really stupid. 
// not \\
 2021-02-26 15:33:37 -06:00
R3dtail
791ddd03d9 Tweaks anamolous crystal to prevent clown-griefing 2021-02-26 15:24:07 -06:00
R3dtail
9ea578987f Bigger Belly 
Doubles the number of characters available to be used for bellies_desc_max.  Additionally, doubles the number of characters available for the bellies_name_max.
 2021-02-26 15:03:32 -06:00
Lin
969487c44e Merge pull request #14316 from Putnam3145/tablet-rad-fix 
Makes tablets not permacontam.
 2021-02-26 14:41:43 -06:00
silicons
318f9f5a3d Merge pull request #14289 from TheObserver-sys/BotanyPassII 
Botany Pass II: How the hell did it take me this long to notice that these things aren't functioning????
 2021-02-26 13:38:56 -07:00
silicons
6c3be09e97 Merge pull request #14300 from keronshb/sentientbuff 
Allows Sentient Disease to purchase most abilities from the start.
 2021-02-26 13:36:27 -07:00
silicons
9e6fb3a310 Merge pull request #14281 from kiwedespars/undo-what-has-been-done 
parrying nerf/pugilism buff
 2021-02-26 13:36:09 -07:00
silicons
0939e31982 Merge pull request #14283 from Hatterhat/patch-1 
buhhh lingfist nerf 3am webedit
 2021-02-26 13:36:01 -07:00
silicons
bf38aa73ff Merge pull request #14285 from kappa-sama/patch-46 
makes tcg cards and binders small and thus easier to store for persistence
 2021-02-26 13:35:02 -07:00
dzahlus
51595705e4 simpin for slimes 2021-02-26 20:59:28 +01:00
dzahlus
12c7e22c28 ugh lavaland 2021-02-26 15:57:27 +01:00
SandPoot
08d19e349f Update code/modules/surgery/advanced/toxichealing.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-02-26 10:06:53 -03:00
Putnam
ac0fd530f2 Makes polychromic windbreaker's message not be nonsense 2021-02-26 00:13:23 -08:00
Putnam
b2388c0f08 Removes auto-matchmaking from valentines event 2021-02-25 23:11:40 -08:00
Putnam
bf6c574ea4 Makes tablets not permacontam. 2021-02-25 05:55:44 -08:00
SandPoot
ccc50ff9ce upload toxichealing.dm 2021-02-24 20:47:46 -03:00
Putnam3145
2156a1566d Merge pull request #14294 from DeltaFire15/maroon-broke 
Once again fixes objective generation
 2021-02-24 03:37:24 -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