shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,816 Commits 5 Branches 0 Tags
79f5feea9f7d472a97b233d948c749edc1d271da
Commit Graph

18822 Commits

Author SHA1 Message Date
keronshb
79f5feea9f Merge remote-tracking branch 'upstream/master' into hereticadjustments 2021-05-11 17:58:41 -04:00
keronshb
4749be2ba8 Final rework 
Last part.
 2021-05-11 16:52:16 -04:00
Lin
82b6443928 Merge pull request #14700 from keronshb/skewerpain 
What if failing to remove a brass skewer caused *pain?
 2021-05-11 14:11:07 -05:00
Lin
0a883f3796 Merge pull request #14706 from DeltaFire15/heretic-bladeshatter-bug 
Fixes heretic bladeshatters, also fixes find_safe_turf since those were related
 2021-05-11 14:08:34 -05:00
keronshb
57dfe8dc09 New Reality when one disappears 
Spawns in a new reality when one disappears.
 2021-05-10 21:12:45 -04:00
Lin
19d6ff8371 Merge pull request #14703 from LetterN/fixes-syndie-shit 
balances syndie simplemob
 2021-05-10 14:29:48 -05:00
DeltaFire
0c0e5f6d18 fixes 2021-05-10 17:44:21 +02:00
Lin
c0a56eb766 Merge pull request #14695 from Putnam3145/supernova-end-notification 
Supernovae now announce when over, + other supernova tweaks
 2021-05-10 01:24:05 -05:00
keronshb
82e4421cde Ports Break in hand from tg 
58526
 2021-05-09 20:01:30 -04:00
LetterN
2bf221be4f fixes syndie simplemob 2021-05-09 21:35:15 +08:00
keronshb
1804b7ba63 Skewer Pain 
Replaces ouchie with *pain
 2021-05-08 19:35:55 -04:00
Putnam3145
90fcc02ba9 Merge pull request #14674 from silicons/atmosstuffs 
[ATMOS CHANGE TESTMERGE THIS OH GOD] adds multiz_accessible_levels infinite loop guard, reworks atmos adjacent turfs proc
 2021-05-07 21:36:46 -07:00
silicons
4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1 
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
 2021-05-07 18:42:24 -06:00
silicons
557eddb7dc Merge pull request #14696 from Putnam3145/priority_announce_verb 
Adds make priority announcement admin verb
 2021-05-07 18:41:48 -06:00
silicons
633591b81e Merge pull request #14688 from SandPoot/good-tooltips 
Makes tooltips good and creates a base for adding more.
 2021-05-07 18:41:22 -06:00
silicons
44fdbaadcb Merge pull request #14684 from zeroisthebiggay/pirates 
Pirate Update: Milk Is Not A Medical Substitute
 2021-05-07 18:40:41 -06:00
silicons
e8b7abcfc6 Merge pull request #14664 from WanderingFox95/WanderingFox95-TheUnrollingPin 
The Unrolling Pin! (Ready)
 2021-05-07 18:40:33 -06:00
Lin
54e12f2478 Merge pull request #14690 from silicons/firefighting_foam 
some changes to firefighting foam, fixes vscode launch bat
 2021-05-07 13:51:05 -05:00
Lin
a40bc38c53 Merge pull request #14671 from timothyteakettle/humans-with-digi-legs 
lets humans have digi legs (and avian legs)
 2021-05-07 01:00:27 -05:00
Lin
470f417a6b Merge pull request #14687 from Arturlang/cum_blood_fixes 
Fixes virus bottles being white
 2021-05-07 00:54:53 -05:00
Putnam
6c8fa56132 Adds make priority announcement verb 2021-05-06 15:10:36 -07:00
Putnam
8d96de6b03 More tweaks, whoops 2021-05-06 14:52:17 -07:00
Putnam
ecca9d788b More supernova tweaks 2021-05-06 14:32:13 -07:00
silicons
6ac964b35a e 2021-05-06 01:52:35 -07:00
SandPoot
6414b371f8 fancy description for the proc 2021-05-06 03:03:46 -03:00
SandPoot
6bd5707a63 found it 2021-05-06 02:50:32 -03:00
zerothebigboy
90930494d6 k 2021-05-05 18:43:11 -04:00
zerothebigboy
c8ebe720ec k 2021-05-05 18:25:05 -04:00
SandPoot
9cf04467a7 upload files 2021-05-05 17:55:30 -03:00
Artur
e5646404d7 Fixes virus bottles being white 2021-05-05 21:34:53 +03:00
zerothebigboy
b1c20269a6 he'sstillafurry 2021-05-05 03:38:14 -04:00
zerothebigboy
5138d86655 skylarlineman'safurry 2021-05-05 03:35:25 -04:00
silicons
d7687c9f3a Merge pull request #14680 from keronshb/shadowalkengraved 
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
 2021-05-04 00:45:47 -06:00
silicons
1ce59b974c Merge pull request #14676 from Bapldap/patch-2 
lesspopcrates(this one works)
 2021-05-04 00:45:12 -06:00
silicons
45bc4fcb46 Merge pull request #14673 from TheObserver-sys/SovietCrate 
Soviet Crates, now available!
 2021-05-03 21:08:37 -06:00
silicons
2bf9c9d21f Merge pull request #14678 from SandPoot/fancy-gateway 
Ports #55624 from tgstation
 2021-05-03 21:07:03 -06:00
keronshb
834ec62c0b Nightmare Jaunt Change 
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
 2021-05-03 00:05:39 -04:00
SandPoot
8f3a44f44a fancy gateway 2021-05-02 18:57:04 -03:00
Bapldap
aefa9eb292 lesspopcrates 
less population required for surplus crates, everyone loves them. I don't see how this could affect gameplay in any negative way :)
 2021-05-01 22:31:24 -05:00
silicons
1f06ac1b42 ohno 2021-05-01 18:18:21 -07:00
The0bserver
f1109c4f67 what a crate day (initial commit) 2021-05-01 02:15:07 -04:00
Timothy Teakettle
ac504d679b digi humans 2021-04-30 14:07:44 +01:00
Lin
c80c974b6c Merge pull request #14668 from qweq12yt/fix-riot-suit 
[Fix] Restores the Sprite for the Riot Suit
 2021-04-29 22:24:00 -05:00
WanderingFox95
3ea98d3096 Merge branch 'master' into WanderingFox95-TheUnrollingPin 2021-04-29 10:54:00 +02:00
silicons
e3755fba92 Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye 
Ports a significant amount of the tg cybernetic organ code + more
 2021-04-28 21:20:57 -06:00
silicons
986aef27b2 Merge pull request #14648 from SandPoot/decal-painter-tgui 
Decal Painter menu is no longer shit and has visible previews.
 2021-04-28 21:20:24 -06:00
silicons
cb0574a560 Merge pull request #14649 from TheObserver-sys/BulletPass 
TRADE OFFER: YOU GIVE ME 30000 PLASMA. I GIVE YOU A SINGLE MAGAZINE OF 10MM INCINDIARY AMMO
 2021-04-28 21:17:55 -06:00
silicons
d4529b1bf3 Merge pull request #14651 from WanderingFox95/WanderingFox95-ReagentDartgunRebalance 
The reagent dart gun uplink item needed work.
 2021-04-28 21:17:36 -06:00
silicons
17d7c4dd9a Merge pull request #14659 from DrPainis/patch-12 
Bubblegum HALLUCINATIONS are capitalized
 2021-04-28 21:17:15 -06:00
silicons
9bef72f205 Merge pull request #14635 from necromanceranne/blindfold_but_not 
Adds fake blindfolds. For reasons.
 2021-04-28 21:17:06 -06:00