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

27024 Commits

Author SHA1 Message Date
zerothebigboy
a5de2a6620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi
 2021-02-14 10:42:59 -05:00
Lin
62fe42513b Merge pull request #14096 from Citadel-Station-13/silicons-patch-27 
makes people on the ground punch less hard. completely removes punch rng miss.
 2021-02-13 23:30:00 -06:00
Lin
b42ca71b00 Merge branch 'master' into virus_logging 2021-02-13 21:20:09 -06:00
Lin
32770ed0d3 Merge pull request #14241 from silicons/logging 
fixes href logging prefiltering of chat pings, removes extraneous newlines from verbose tgui logging
 2021-02-13 21:17:37 -06:00
silicons
61ab2a5a53 logging fixes 2021-02-13 19:47:17 -07:00
silicons
0aea43afcc Merge pull request #14224 from DeltaFire15/no-more-YELLING 
Makes clockies yell less
 2021-02-13 19:06:57 -07:00
silicons
5990a3ad4b Merge pull request #14227 from Adelphon/polycloth 
CLOAK, PARKA, COLORFUL SHOES
 2021-02-13 19:06:46 -07:00
silicons
aeb9b1e06c Merge pull request #14233 from DeltaFire15/armwrap-kneecap 
About unarmed parrying..
 2021-02-13 19:06:39 -07:00
silicons
3b441bfd28 kay 2021-02-13 19:03:27 -07:00
silicons
77f4e08727 AAAAAAAAA 2021-02-13 18:57:30 -07:00
Lin
98736a7a37 Merge pull request #14207 from TyrianTyrell/master 
Multilingual fix? (Has since been tested.)
 2021-02-13 16:41:10 -06:00
zerothebigboy
d43c7c00f6 conflicts and stealth nerf 2021-02-13 13:51:03 -05:00
zerothebigboy
3e08ab2bcc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/obj/items_and_weapons.dmi
 2021-02-13 13:45:59 -05:00
silicons
731c368ba7 Merge pull request #14231 from DeltaFire15/sigh 
sigh
 2021-02-12 19:00:14 -07:00
silicons
ae55071fe8 Merge pull request #14232 from DeltaFire15/better-be-named 
Fixes & Improves some antagpanel stuff
 2021-02-12 19:00:07 -07:00
silicons
76837ee0b6 Merge pull request #14225 from Hatterhat/dth-kit-pass2 
[hello if someone could fight the maintainers to take a look that'd be great] fixes durathread armor kits
 2021-02-12 18:54:36 -07:00
TyrianTyrell
a4bb96f614 Update good.dm 2021-02-12 07:02:14 -05:00
DeltaFire
1ea3aafa10 Merge pull request #14166 from Hatterhat/ebola-nerf 
energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove
 2021-02-12 05:06:48 +01:00
DeltaFire
06101ee9c8 sigh 2021-02-12 03:30:15 +01:00
DeltaFire
b0ff405a13 cool 2021-02-12 03:06:53 +01:00
DeltaFire
fb4641b348 e 2021-02-12 02:42:59 +01:00
Hatterhat
7ec692ef60 this is good...isn't it? 2021-02-11 19:08:29 -06:00
Lin
61877a3d1c Merge pull request #14223 from timothyteakettle/quieten-a-log 
changes a migration error to use log_game instead of message_admins
 2021-02-11 19:02:44 -06:00
DeltaFire
5afa573fa6 sigh 
sigh
 2021-02-12 00:50:42 +01:00
Adelphon
919e23c122 More Clothes 2021-02-11 02:36:50 -05:00
Hatterhat
8103078ff1 second pass pt2 2021-02-11 00:29:25 -06:00
Hatterhat
3040eca4e0 holy shit what was i thinking god FUCK durathread 2021-02-11 00:20:49 -06:00
DeltaFire
7259f53160 Merge pull request #14206 from Citadel-Station-13/silicons-patch-10 
Nerfs VoG stun, knockdown, vomit. Removes sleep command.
 2021-02-11 04:32:37 +01:00
DeltaFire
7fbb41eee0 screaming 2021-02-11 04:12:42 +01:00
zeroisthebiggay
aa2e11a417 medica medica medica medica 
medica medica medica medica
 2021-02-10 20:53:29 -05:00
zeroisthebiggay
c3f0d0b9c8 fixes some bullshit assery 
fixes some bullshit assery
 2021-02-10 20:40:39 -05:00
zerothebigboy
a2a8ab12c6 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum 2021-02-10 20:01:09 -05:00
zerothebigboy
ec8029b0cc a couple more fixes 2021-02-10 20:00:04 -05:00
zeroisthebiggay
969ac7e5e4 now no longer wrong 
now no longer wrong
 2021-02-10 19:01:08 -05:00
zerothebigboy
00d7b0c9c9 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum 2021-02-10 18:57:05 -05:00
zerothebigboy
de2e410c6f a bit more stuff 2021-02-10 18:55:56 -05:00
Timothy Teakettle
d858c420aa Update preferences_savefile.dm 2021-02-10 23:18:53 +00:00
zeroisthebiggay
73020eba35 information here is wrong 
information here is wrong
 2021-02-10 14:27:14 -05:00
zerothebigboy
87eb447c10 some final touch ups 2021-02-10 14:22:04 -05:00
TyrianTyrell
5769cc106b Update good.dm 2021-02-10 13:56:56 -05:00
zeroisthebiggay
e530e8d103 god i hate this 
god i hate this
 2021-02-10 13:05:21 -05:00
zerothebigboy
d98b87bbe0 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum 2021-02-10 12:55:54 -05:00
zerothebigboy
058369a56d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi
 2021-02-10 12:55:45 -05:00
zeroisthebiggay
2645f0f953 back down to fifteen 
back down to fifteen
 2021-02-10 11:08:03 -05:00
silicons
c8cf061773 Merge pull request #14211 from timothyteakettle/better-logging 
pickpocketing is now logged outside of hrefs
 2021-02-10 02:09:50 -07:00
silicons
4b089f3514 Merge pull request #14202 from DeltaFire15/robo-vendor 
Adds nanogel to the robodrobe
 2021-02-10 02:09:29 -07:00
silicons
74a7c1e9fb Merge pull request #14203 from zeroisthebiggay/patch-4 
makes the a.sterile mask no longer hide your face
 2021-02-10 02:09:20 -07:00
silicons
f0f9a865e6 Merge pull request #14204 from keronshb/powersinkobj-removal 
Removes the Power Sink Objective
 2021-02-10 02:09:09 -07:00
silicons
e8da810cd3 Merge pull request #14205 from keronshb/warpimplant-adjustment 
Triples Warp Implant's cooldown
 2021-02-10 02:08:57 -07:00
silicons
ca906eb683 Merge pull request #14208 from dzahlus/grenadelaunch.ogg 
sound PR oversights fix
 2021-02-10 02:07:57 -07:00