shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,255 Commits 5 Branches 0 Tags
577cd537b3cfb04ee7d589fa74c931c1a45f3b31
Commit Graph

17104 Commits

Author SHA1 Message Date
silicons
577cd537b3 Merge pull request #13654 from ArchieBeepBoop/giftfix 
Christmas Tree / Jacqueen Gift Blacklist
 2020-11-07 00:32:09 -07: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
0c24740e95 Merge pull request #13656 from MrJWhit/more-time-for-canceling-events 
More time for admins to cancel events
 2020-11-07 00:30:40 -07:00
silicons
87e40f294b Merge pull request #13657 from DeltaFire15/transmission-sigil-fix 
Fixes transmission sigil power drain
 2020-11-07 00:30:27 -07:00
silicons
a00873a0ee Merge pull request #13658 from DeltaFire15/void-volt-tweaking 
Changes to void volt and the clock power_drain() proc
 2020-11-07 00:30:19 -07:00
silicons
173a1ef0f1 Merge pull request #13639 from Trilbyspaceclone/shhhh 
More guns can be suppressed
 2020-11-07 00:20:45 -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
silicons
77a1bdba0c Merge pull request #13630 from timothyteakettle/short-tall-quirks 
character size scaling
 2020-11-07 00:19:29 -07:00
silicons
2b273addf1 Merge pull request #13618 from Vynzill/mappinghell 
new jungle gateway map
 2020-11-07 00:19:11 -07:00
silicons
a13765b7c9 Merge pull request #13521 from DeltaFire15/zeolites-tweaking 
[READY] Rebalances zeolites and their reaction
 2020-11-07 00:16:29 -07:00
DeltaFire
7d04d805d6 typo 2020-11-05 17:10:02 +01:00
DeltaFire
ec456dd386 changes voidvolt + power_drain 
see PR desc for details
 2020-11-05 16:54:35 +01:00
DeltaFire
f9122e23e1 fixes transmission sigils not draining power 
if they do stuff while processing, they should probably process.
 2020-11-05 13:53:27 +01:00
MrJWhit
c1aad0fa27 Update _event.dm 2020-11-04 16:43:44 -05:00
Dip
3afd604913 remove projectiles 2020-11-04 17:28:23 -03:00
timothyteakettle
3d2c07be82 Update human.dm 2020-11-03 22:59:24 +00:00
Dip
0951e9457f right, forgot that object. 2020-11-02 16:50:45 -03:00
Dip
76e739142b Yeah let's fucking not have jacqueen or the christmas tree spawn runtimes 2020-11-02 16:46:34 -03: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
db87297536 fix (#13632) 2020-11-01 22:03:43 +01:00
ArchieBeepBoop
9eff4147fd Fixes the Layer 3 Outlet Injector mapping asset being on the wrong layer (#13633) 
* why is this on the wrong layer?

* ahem, icon state.

Co-authored-by: Dip <gabriel.spm002@gmail.com>
 2020-11-01 22:02:15 +01:00
silicons
57677183d3 Update anomaly.dm (#13629) 2020-11-01 22:01:57 +01:00
DeltaFire15
91584053f5 Fixes a bunch of fallout from the tgui PR (#13648) 
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
 2020-11-01 21:59:22 +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
deathride58
b11947a468 covers filters and mixers as well 2020-10-29 21:31:06 -04:00
deathride58
5d79ea3441 forgot volume pumps, fuk 2020-10-29 21:00:56 -04:00
deathride58
75280c9705 patches recently-found atmos circuit exploit 2020-10-29 20:27:47 -04:00
Trilby
3307711f08 suppression 2020-10-28 13:00:02 -04: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
2d842270f5 Merge pull request #13625 from LetterN/revert-12994-patch-37 
Reverts this circuit frame removal
 2020-10-28 07:53:15 -07:00
silicons
598c2fab2b Merge pull request #13616 from Citadel-Station-13/Ghommie-patch-1 
Quick clown/mime masks designs fix.
 2020-10-28 07:49:38 -07:00
silicons
5c53a2cbe2 Merge pull request #13607 from timothyteakettle/polychrome-maid 
polychromic maid outfit
 2020-10-28 07:46:55 -07:00
silicons
f2747a3b1c Merge pull request #13605 from Trilbyspaceclone/patch-403 
Adds corporate uniforms to the clothing vender
 2020-10-28 07:46:24 -07:00
silicons
1a1b6af819 Merge pull request #13603 from kappa-sama/patch-43 
controversial shotgun buff (very scary)
 2020-10-28 07:44:02 -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
timothyteakettle
2275dde281 prior fix didnt work this does 2020-10-27 00:15:58 +00:00
timothyteakettle
79e81a455a old fix 2020-10-26 23:52:20 +00:00
Timothy Teakettle
f468e4940a typo 2020-10-26 20:33:46 +00:00
Timothy Teakettle
4e6146898c fixes/config edits 2020-10-26 20:27:58 +00:00
Timothy Teakettle
2b00f2bb2f config values 2020-10-26 20:27:02 +00:00
Timothy Teakettle
38313fa362 i hate dwarves 2020-10-26 17:50:21 +00:00
Timothy Teakettle
cfefe99d35 okay so what if its not quirks 2020-10-26 17:45:43 +00:00
Ghommie
444a440fba oh 2020-10-25 15:38:36 +01: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
Delams-The-SM
52abbbf247 Fixes matrix color radomisation in /proc/randomize_human (#13599) 2020-10-25 13:07:46 +01:00
zeroisthebiggay
626fcf0aeb OOPS 
FUCK
 2020-10-25 05:36:59 -04:00