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

27891 Commits

Author SHA1 Message Date
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
silicons
86bdb2455d Merge pull request #14636 from TheObserver-sys/CrateDeal 
Inconsistency Fixes, 10MM Rifle tweaks.
 2021-04-28 21:16:58 -06:00
silicons
b108a6fe7e Merge pull request #14643 from necromanceranne/space_adapt_resprite 
Changes the space adaptation sprite to something more subtle.
 2021-04-28 21:16:51 -06:00
Putnam3145
8f14424a63 Fixes a couple runtimes in activity tracking (#14666) 2021-04-28 22:56:15 +02:00
keronshb
6d86809616 Removes the Reinforcement Chromosome from Genetics. (#14641) 
* Removes Mutadone Proof from Genetics

This might be a bit too good.

* Fixes so mutadone actually works

Oops

* Removes the reinforcement chromosome

Removes the reinforcement chromosome
 2021-04-28 14:09:37 +02:00
silicons
03fa382f36 Update autobunker.dm 2021-04-26 13:57:34 -07:00
silicons
7c1358a39d Merge pull request #14642 from SandPoot/tgui-select-equipment-menu 
TGUI Select Equipment menu
 2021-04-25 17:10:09 -06:00
DrPainis
e313fed033 hallucinations are capitalized too 2021-04-25 19:04:07 -04:00
SandPoot
c2b7140ddd upload icons.dm 2021-04-24 21:43:12 -03:00
SandPoot
90661d3687 upload files 2021-04-24 21:37:01 -03:00
silicons
d07f1f3d30 Update radioactive.dm (#14615) 2021-04-24 21:51:53 +02:00
WanderingFox95
ace2f522fb No more Suicidal Parrots! (Ready) (#14628) 
* Modifies Parrots

They spawn from hostile triggers, not as friendly pets now.

* Removes Parrots from Gold Extracts altogether
 2021-04-24 21:47:04 +02:00
DrPainis
7d6cb67c91 literally just changes one letter (#14634) 2021-04-24 21:40:41 +02:00
silicons
0534f70ccd Update bitfields.dm (#14645) 2021-04-24 21:29:53 +02:00
WanderingFox95
80f4f1b4b3 Cleaning up something annoying 2021-04-24 11:36:49 +02:00
The0bserver
c7b231637e boxes of ammo, also fire not weapon is bullet 2021-04-24 00:53:57 -04:00
WanderingFox95
bda2865530 Made the description actually describe the limitaitons 2021-04-23 23:24:41 +02:00
WanderingFox95
35269554bb Adjusts TC cost 
Shouldn't be over half your TC, if the Dart Pistol is only 2 TC and infinitely more useful under non-role restricted circumstances
 2021-04-23 23:18:13 +02:00
WanderingFox95
4e0bf12c0c Modifies dart size and properties 
They inject less but pierce again
 2021-04-23 23:15:40 +02:00
WanderingFox95
1d42e9f4e0 Adjusts projectile count and delay 2021-04-23 23:12:58 +02:00
necromanceranne
c819879473 Changes the space adaptation sprite to something more subtle. 2021-04-23 12:06:24 +10:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03:00
Lin
0c5d19ecc8 Merge pull request #14633 from Citadel-Station-13/silicons-patch-24 
fixes a slightly important thing
 2021-04-22 18:28:35 +00:00
silicons
75e3f5eae6 Merge pull request #14573 from zeroisthebiggay/eatshitanddie 
pov: you're an enraged miner main that hates having their loot require a modicum of effort (ports tg ash drake)
 2021-04-21 13:50:46 -06:00
The0bserver
892dcaf976 dumdum crate now dumdum crate dumdum 2021-04-21 02:31:44 -04:00
The0bserver
7102ec121c missed one. 2021-04-21 02:31:08 -04:00
The0bserver
4e3ab78ebd Best to look the part. 2021-04-21 02:25:55 -04:00
The0bserver
57e0056ffc Spain without the S (Initial Commit) 2021-04-21 01:46:33 -04:00
necromanceranne
0a5b587304 Adds fake blindfolds. For reasons. 2021-04-21 12:06:34 +10:00
DrPainis
ac96276f8e literally just changes one letter 2021-04-20 16:20:44 -04:00
silicons
8510542260 Update autobunker.dm 2021-04-20 04:55:00 -07:00
silicons
f0c2188c5f Merge pull request #14443 from necromanceranne/baton_change_pr 
Another dreaded baton rework pr; batons knockdown and slow on rightclick (with a cooldown), otherwise stagger, plus more
 2021-04-20 05:52:59 -06:00
silicons
821511e64e Merge pull request #14571 from BlueWildrose/piracyisillegal 
Space pirate sleepers can now be crowbared to be destroyed
 2021-04-18 19:38:41 -06:00
silicons
cb87f798c3 Merge pull request #14631 from keronshb/slaughtereventlower 
Kev please don't kill me for a one number change but this lowers Slaughter Demon Weight
 2021-04-18 19:13:24 -06:00
keronshb
c872055821 Lowers demons weight 
Bit too hjgh
 2021-04-18 21:03:54 -04:00
silicons
74280ed082 Merge pull request #14582 from BlueWildrose/slimeorgans 
Slimeperson organs are now unique with a unique name, therefore confusing people
 2021-04-18 19:02:53 -06:00
BlueWildrose
911d8ffc12 requested changes 2021-04-18 18:02:04 -07:00
silicons
af7bb2e09f Merge pull request #14585 from zeroisthebiggay/cumbblegum 
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
 2021-04-18 19:00:14 -06:00
silicons
848f1fc50d Merge pull request #14578 from qweq12yt/louder-sm-delams 
LOUDER DELAMS
 2021-04-18 18:57:47 -06:00
necromanceranne
75e0e893a2 Merge branch 'master' into baton_change_pr 2021-04-19 10:55:33 +10:00
silicons
b41790842b Merge pull request #14546 from Putnam3145/bluespace-pipe 
Ports bluespace pipes from yogs
 2021-04-18 18:53:14 -06:00
silicons
0dcc6b44ba Merge pull request #14543 from qweq12yt/cargo-bugfixes 
Cargo bugfixes
 2021-04-18 18:52:54 -06:00
silicons
73d5b99b64 Merge pull request #14625 from Hatterhat/patch-4 
solars plastitanium glass fix
 2021-04-18 18:52:29 -06:00
silicons
9c780f7672 Merge pull request #14624 from DrPainis/patch-9 
adds ash drake meat
 2021-04-18 18:51:34 -06:00
silicons
5ec71d5beb Merge pull request #14621 from LetterN/patch-7 
Easy area bflag editing
 2021-04-18 18:51:24 -06:00
silicons
757db58ef5 Merge pull request #14617 from keronshb/dragnetadjust 
CONSITENCY: Matches Dragnet breakout time to Energy Bolas
 2021-04-18 18:51:01 -06:00
silicons
9f032df236 Merge pull request #14608 from TheObserver-sys/TheHoldoutUpdate 
The Holdout Update: How I learned to stop whining, and aim a pocket pistol.
 2021-04-18 18:50:37 -06:00