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

5848 Commits

Author SHA1 Message Date
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
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
c23db5daee Merge pull request #14327 from qweq12yt/pacifist-zombo-fix 
fixes pacifist zombies
 2021-03-01 18:26:16 -07: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
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
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
qweq12yt
04d478bb20 turning removes pacifism 2021-02-27 01:49:56 -03: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
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
dzahlus
12c7e22c28 ugh lavaland 2021-02-26 15:57:27 +01:00
DeltaFire
b214d70383 Merge pull request #14268 from Citadel-Station-13/silicons-patch-16 
alternatively, replaces the cube sentinel spawn with an actual simplemob sentinel that drops a carbon sentinel body on death so you still get to run this to the ground without being able to be a literal alien queen
 2021-02-23 13:01:27 +01:00
SandPoot
eb4fcd8a00 for some reason A doesn't have istype? what. 2021-02-22 13:51:49 -03:00
SandPoot
19efaba061 upload hivelord.dm 2021-02-22 13:37:49 -03:00
SandPoot
d9e966234a upload hivelord.dm 2021-02-22 13:36:06 -03:00
silicons
ae63422727 Merge pull request #14269 from Putnam3145/aphro-readd 
More arousal logging; adds back aphro/nympho
 2021-02-21 14:50:32 -07:00
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing 
Tool behavior replacing
 2021-02-21 14:48:50 -07:00
Hatterhat
1eb2d3dd93 buhhh lingfist nerf 2021-02-21 02:58:19 -06:00
kiwedespars
6a694841aa i forgot this thing 
microstagger is now a stagger
 2021-02-20 17:46:06 -08:00
kiwedespars
15a8d1d5e0 i did a thing 
- reverted salt nerf
- made it so you can't parry while resting
 2021-02-20 17:24:30 -08:00
silicons
e36794d0f5 Merge pull request #14271 from shellspeed1/revert-14248-trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs 
Revert "Fix for floorbots not placing a plate before placing a floor."
 2021-02-20 02:59:16 -07:00
silicons
cabc471d92 Merge pull request #14273 from timothyteakettle/chaplain-vampire 
chaplain vampires won't burn in their own chapel now
 2021-02-20 02:58:06 -07:00
Timothy Teakettle
9528cc9ce4 woops i left that in 2021-02-19 19:36:19 +00:00
Timothy Teakettle
94ad05b2bc better idea 2021-02-19 17:14:36 +00:00
Timothy Teakettle
9de5e5f5fa Update vampire.dm 2021-02-19 17:07:41 +00:00
shellspeed1
f17be50d5f Revert "Fix for floorbots not placing a plate before placing a floor." 2021-02-18 23:28:10 -08:00
Putnam
257cd6bb34 keyword argument funnies, whoops comma 2021-02-18 21:55:28 -08:00
Lin
1acd81c036 Merge pull request #14246 from TyrianTyrell/master 
Multilingual conditions fix.
 2021-02-18 23:36:20 -06:00
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
silicons
2a6e70941d Update alien.dm 2021-02-18 17:41:27 -07:00
silicons
ce013a5122 Update alien.dm 2021-02-18 17:34:51 -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
2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Lin
460042bc33 Merge pull request #14248 from shellspeed1/trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs 
Fix for floorbots not placing a plate before placing a floor.
 2021-02-17 17:28:03 -06:00
shellspeed1
303d35074d Another fix for infinite floor tiles 2021-02-16 20:24:50 -08:00
TyrianTyrell
6f25b65290 Apply suggestions from code review 
Let's see if it will?

Co-authored-by: Lin <linzolle@gmail.com>
 2021-02-16 03:24:27 -05:00
silicons
3cac44b2f0 a 2021-02-15 19:35:16 -07:00
Lin
975c98731e Merge pull request #14242 from timothyteakettle/age-gate-2-electric-boogaloo 
age gate 2 electric boogaloo
 2021-02-15 18:16:44 -06:00
TyrianTyrell
915b911a40 Update say.dm 2021-02-15 17:15:30 -05:00
Lin
142be853dc Merge pull request #14245 from silicons/sprint_staging 
adds config entry for sprint removal that works prettier than just setting sprint speed to 0
 2021-02-14 22:52:44 -06:00
shellspeed1
3222703917 makes floor bots place a plate before a tile 2021-02-14 16:42:59 -08:00
SandPoot
4e18044450 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 + recompile tgui 2021-02-14 20:10:41 -03:00
TyrianTyrell
58469ea2a1 Update say.dm 2021-02-14 11:53:44 -05:00