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

25681 Commits

Author SHA1 Message Date
silicons
7bce2115db Merge pull request #13642 from Citadel-Station-13/tgs-dmapi-update 
Automatic TGS DMAPI Update
 2020-11-07 00:33:36 -07:00
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
aab0b000c8 Merge pull request #13659 from timothyteakettle/gateway-fix 
admins loading gateways will no longer crash the server
 2020-11-07 00:30:06 -07:00
silicons
27f53a8af7 Merge pull request #13641 from MrJWhit/combat-knife-nerf 
Nerfs combat knife damage
 2020-11-07 00:29:14 -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
ab33acf962 Merge pull request #13602 from Putnam3145/better_dynamic 
Adds a new "minor antag" roundstart to dynamic
 2020-11-07 00:18:51 -07:00
silicons
1a2abc5a2e Merge pull request #13604 from Trilbyspaceclone/welding 
Makes welder code better*
 2020-11-07 00:18:26 -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
tgstation-server
ce8dba6062 Update TGS DMAPI 2020-11-07 00:37:22 +00:00
Timothy Teakettle
8b7fd151af deletes one word 2020-11-05 16:59:49 +00: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
Timothy Teakettle
f5804fd0e4 yes 2020-10-30 20:41:13 +00: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
Trilbyspaceclone
366a605915 Update weldingtool.dm 2020-10-29 10:53:45 -04:00
MrJWhit
92f31a9a5f Update kitchen.dm 2020-10-28 15:39:51 -04:00
Trilby
3307711f08 suppression 2020-10-28 13:00:02 -04:00
Trilbyspaceclone
a837af1436 Update weldingtool.dm 2020-10-28 12:37:50 -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
silicons
e672ee847e Merge pull request #13592 from Putnam3145/stat-voting-tweaks 
Adds ranked choice ballots to stat voting
 2020-10-28 07:41:43 -07:00
silicons
a3228b3366 Merge pull request #13593 from Putnam3145/add-all-vote-types-to-maps 
Stringified the vote #defines for easier config stuff
 2020-10-28 07:41:35 -07:00