shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,289 Commits 5 Branches 0 Tags
00adf078b0caed5aa38d50df4e65e793cf72568d
Commit Graph

5451 Commits

Author SHA1 Message Date
silicons
0001a2edca Merge pull request #13669 from Arturlang/sacrifice_tweaks 
Makes cult sacrifice not permakill people anymore.
 2020-11-11 11:16:15 -07:00
silicons
ee583cdc4e Merge pull request #13668 from timothyteakettle/age-verification 
why is making the server make a note unnecessary cbt
 2020-11-11 11:13:41 -07:00
Timothy Teakettle
f950424785 more text changes 2020-11-10 16:00:19 +00:00
Timothy Teakettle
2115e14d22 typo 2020-11-10 15:48:49 +00:00
Timothy Teakettle
09035855e7 some qol 2020-11-10 15:48:11 +00:00
Artur
8ce058a593 Fixes stupid mistakes 2020-11-09 14:39:51 +02:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
Timothy Teakettle
4db4fcb16e Update new_player.dm 2020-11-08 18:18:33 +00:00
LetterJay
f54eee63cc Merge pull request #13667 from timothyteakettle/age-verification 
automated age verification uses a system note instead of an admin note
 2020-11-08 11:58:34 -06:00
Timothy Teakettle
c90b197b00 different note 2020-11-08 17:51:51 +00:00
LetterJay
15834d3cdc Merge pull request #13666 from timothyteakettle/age-verification 
heehoo typo
 2020-11-08 11:34:58 -06:00
Timothy Teakettle
38e60025cf heehoo typo 2020-11-08 17:33:18 +00:00
LetterJay
10c90e06c1 Merge pull request #13661 from timothyteakettle/age-verification 
adds in-game age verification as an alternative to access requests
 2020-11-08 11:07:05 -06:00
Timothy Teakettle
29f1132d36 Update new_player.dm 2020-11-08 02:25:53 +00:00
Timothy Teakettle
5eaac21127 okay 2020-11-07 19:44:06 +00:00
Timothy Teakettle
68c0caf4fa better verification 2020-11-07 19:32:23 +00:00
silicons
6ed0563bab Merge pull request #13655 from timothyteakettle/haha-slip-go-brrr 
fixes held items proccing crossed when passing someone
 2020-11-07 00:31:07 -07:00
silicons
cc56fc560e Merge pull request #13635 from Hatterhat/funny-hands-nerf 
bone gauntlets bandaid nerf
 2020-11-07 00:20:01 -07:00
Timothy Teakettle
82e561675c yes 2020-11-06 21:47:22 +00:00
Timothy Teakettle
e2ca7164b9 age verification 2020-11-06 21:00:14 +00:00
timothyteakettle
3d2c07be82 Update human.dm 2020-11-03 22:59:24 +00:00
silicons
d500a12b70 adds EMOTE_BOTH and EMOTE_OMNI which is both audible/visible and ignores checks entirely. subtler/subtle is omni and regular emotes are both. (#13584) 
* Update say.dm

* Update mob.dm

* Update emotes.dm

* Update say_vr.dm

* Update emote.dm

* Update emotes.dm

* Update mob.dm

* Update say_vr.dm

* Update drake.dm
 2020-11-01 22:09:38 +01:00
silicons
4017618744 removes batform from roundstart halloween vampire (#13623) 
* Update species.dm

* Update vampire.dm

* Update vampire.dm
 2020-11-01 22:05:49 +01:00
Timothy Teakettle
46dbb9345d slime puddles look better and cant be abused by lings (#13567) 
* perfect

* further changes

* no squeaking please

* no more squeaking damnit

* no more squeaking damnit

* slower

* they get broken armor

* broken armor application

* Apply suggestions from code review

* add a comma

* make crossed work properly

* Update squeak.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-11-01 21:40:58 +01:00
silicons
1baa3013b3 Merge pull request #13626 from zeroisthebiggay/GOD 
[SALT] MAKES MEGAFAUNA ITEMS LAVAPROOF (LIKE THE LAVA STAFF)
 2020-10-28 07:53:44 -07:00
silicons
0307884eab Merge pull request #13627 from Ghommie/Ghommie-cit841 
Here I fix a few issues.
 2020-10-28 07:53:22 -07:00
silicons
6d2028abb5 Merge pull request #13601 from timothyteakettle/critical-item 
antagonistic items will no longer fail to be placed on you
 2020-10-28 07:43:39 -07:00
Hatterhat
a4196e567b i told me there'd be balance issues 2020-10-27 22:35:27 -05:00
Ghommie
f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
zeroisthebiggay
626fcf0aeb OOPS 
FUCK
 2020-10-25 05:36:59 -04:00
zerothebigboy
6577aaac91 FRUSTRATION 2020-10-25 05:30:06 -04:00
silicons
585208dda9 Update angel.dm (#13621) 2020-10-24 21:22:32 +02:00
Timothy Teakettle
4afceebcc1 critical 2020-10-20 02:11:08 +01:00
Zandario
fcd8fec815 Fixes an oversight and updates some defines (#13558) 2020-10-17 12:37:58 +02:00
Putnam3145
f6b93a242c Makes get_damaged_bodyparts use proper arguments (#13570) 
* you're not being clever, you're being obfuscatory, stop this

* Made get_damaged_bodyparts use proper arguments

* Actually shouldn't have the arg
 2020-10-17 11:44:15 +02:00
DeltaFire15
ca21572aa7 Fixes vamp shapeshifting a bit (#13562) 
* fixes vamp shapeshifting a bit

Title. Buncha weird stuff happening.

* ghom's request

moves the check to ../bat/cast(), adds type safety
 2020-10-17 11:39:58 +02:00
MrJWhit
4fdacf0560 Porting putnams ventcrawling PR and Fix (#13571) 
* Porting putnams rage

* And the bugfix
 2020-10-17 11:39:25 +02:00
BlueWildrose
a134bedd4c Fixes subtle hotkey, adds subtler hotkey (#13575) 2020-10-16 17:22:35 +02:00
zeroisthebiggay
ea80867cda Update legion.dm (#13566) 2020-10-15 11:48:12 +02:00
Putnam3145
78a9c61952 Makes dwarf text not check every replacement every time. (#13346) 
* Makes dwarf text not check every replacement every time.

* Apply suggestions from code review

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-10-12 13:26:18 +02:00
silicons
a5ace5ed3a Merge pull request #13543 from zeroisthebiggay/tyrna 
ports tg legion reworks, colossus now enrages against sand golems, and some minor sprite stuff with him too
 2020-10-11 17:33:16 -07:00
silicons
29b7b49fe9 Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2 
Robotic limbs 2 : Threshhold Boogaloo
 2020-10-11 17:33:00 -07:00
Tupinambis
8c22580c08 Update species.dm 
consistent commenting even though it's not consistent anyway.
 2020-10-11 14:35:59 -05:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
DeltaFire
36ac341e81 e 
empty lastline moment
 2020-10-11 15:45:07 +02:00
DeltaFire
a5fce4b6ed Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 15:39:41 +02:00
BlackMajor
313970000b Merge pull request #13522 from silicons/async 
Fixes the intermittent master controller lockups
 2020-10-11 18:48:37 +13:00
BlackMajor
92b88925de Merge pull request #13542 from Citadel-Station-13/silicons-patch-15 
removes gibbing (blobattack) sound from *blorble so it always plays the far nicer attackblob sound instead
 2020-10-11 18:42:06 +13:00
silicons
7f611a98e1 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-10 22:23:22 -07:00