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

5908 Commits

Author SHA1 Message Date
silicons
73d5b99b64 Merge pull request #14625 from Hatterhat/patch-4 
solars plastitanium glass fix
 2021-04-18 18:52:29 -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
silicons
e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option 
Activity tracking; traitor class tweaks
 2021-04-18 18:49:27 -06:00
silicons
02f4bd8f3a Merge pull request #14591 from zeroisthebiggay/deathrattles 
ports deathrattle implants but without mob statchange because i am not gonna port that today
 2021-04-18 18:48:08 -06:00
silicons
30fd90a87c Merge pull request #14606 from SandPoot/cloning-machine-tgui 
TGUIZES the cloning computer
 2021-04-17 17:00:49 -06:00
Hatterhat
4186b15a69 plastitanium glass OSC 2021-04-17 16:51:08 -05:00
keronshb
77806ad216 Adjusts Dragnet to match Ebola 
Consistency
 2021-04-15 20:58:30 -04:00
The0bserver
c313ba38b8 adds the .38 2021-04-14 01:26:24 -04:00
The0bserver
27c49b3f34 fox fix 2021-04-13 23:38:50 -04:00
The0bserver
64a3cd9404 T. Derringer has twin calibers, Station gets .38 2021-04-13 23:22:35 -04:00
SandPoot
330a3b8c9a upload files 2021-04-13 17:25:08 -03:00
DeltaFire
f1e1169e85 dispenser moment 2021-04-13 17:33:04 +02:00
Putnam
4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
silicons
a62d942bee telescopic batons now have a message when being toggled. you can now threateningly point extended telebatons at people. (#14580) 
* Update misc.dm

* Update code/game/objects/items/melee/misc.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-04-13 10:22:01 +02:00
The0bserver
1d31fb084f More concealment, fixes a problem with the .45-70 2021-04-11 19:40:54 -04:00
The0bserver
9fe8fb7671 More work 2021-04-11 07:20:06 -04:00
The0bserver
e75088420d Error fixing. 2021-04-11 04:38:46 -04:00
The0bserver
55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
zerothebigboy
a7c061392b i hate tg code 2021-04-08 18:05:36 -04:00
silicons
08cd9b1bfd Merge pull request #14576 from SandPoot/another-locker-change-thing 
Another closet change
 2021-04-08 03:24:59 -06:00
silicons
3416989b7c Merge pull request #14552 from BlueWildrose/PillsHere 
I could blot the sun out with these titty pills and some certain catgirls here STILL wouldn't be satisfied.
 2021-04-08 03:23:32 -06:00
silicons
f1de2d37aa Merge pull request #14535 from brokenOculus/adds-Telescopic-Baseball-bat 
Adds telescopic baseball bat
 2021-04-08 03:22:56 -06:00
SandPoot
29bf226fe1 upload closets.dm 2021-04-06 18:18:08 -03:00
silicons
cbd7e0de6a Merge pull request #14418 from LetterN/perlin-genny 
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
 2021-04-06 04:10:00 -06:00
Lin
c65b1791d0 Merge pull request #14547 from SandPoot/lockers-and-laptops 
Fixing some issues for laptops and lockers/crates.
 2021-04-04 23:22:41 -05:00
Eric
7a135d2346 Adds Telescopic bat to uplink Baseball bundle. 2021-04-03 17:11:06 -05:00
Eric
65bcb8fc35 removes bat attaching to belt 
seems a little OP I guess?
 2021-04-03 16:58:08 -05:00
BlueWildrose
5152a605d8 this is very warming 2021-04-01 11:36:30 -07:00
Blue Wildrose
fcd1080069 more booby and dick pill 2021-04-01 05:36:43 -07:00
SandPoot
2381db5f53 upload files 2021-03-31 12:35:43 -03:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
Eric
81a222b90f Update weaponry.dm 
adds Telescopic baseball bat and its telescopic functionalities.
 2021-03-28 22:29:23 -05:00
Lin
0f5d5522b0 Merge pull request #14431 from YakumoChen/ancient-bundle 
Ports Ancient bundle from TG
 2021-03-28 18:09:38 -05:00
silicons
2a7aa8e826 Merge pull request #14524 from SandPoot/borgs-buff 
Allows borgs to move pulled stuff around like a human
 2021-03-28 13:48:14 -06:00
silicons
f269a8d35f Merge pull request #14274 from timothyteakettle/disguise 
lets ghost cafe residents disguise themselves as any mob or object
 2021-03-27 01:37:09 -06:00
silicons
3ffe980e35 Merge pull request #14486 from keronshb/radioactivemicroport 
patches out a radioactive microlaser tech, makes radioactive microlasers not knock out rad-immune creatures
 2021-03-27 01:36:19 -06:00
silicons
8a5d87725b Merge pull request #14515 from CuteMoff/Plasmaispogtake2 
Lets try again, Plasma Ingots (Fucked up the first time)
 2021-03-27 01:32:47 -06:00
silicons
bf382f490c Merge pull request #14518 from necromanceranne/shield_explodies_fix 
Shields: Changes, additional flags, bug fixes, sprites
 2021-03-27 01:31:55 -06:00
SandPoot
0994a37af5 upload files 2021-03-26 11:05:36 -03:00
necromanceranne
2368968c66 Ports #42721 which happened to resolve this already 2021-03-26 08:45:14 +11:00
necromanceranne
84223c65f5 Adds the shield flags to the ratvaran shield, adds the remaining sprites for the kinetic/energy/holo shields 2021-03-26 07:07:48 +11:00
CuteMoff
dd295d20c2 Merge branch 'master' into Plasmaispogtake2 2021-03-25 10:44:12 -04:00
CuteMoff
3efce37fd9 Update mineral.dm 2021-03-25 10:32:13 -04:00
keronshb
b06c15ab30 Update traitordevices.dm 
Fixed
 2021-03-24 21:32:31 -04:00
necromanceranne
79de55c58c First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately. 2021-03-25 09:07:52 +11:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
CuteMoff
ea200acd9f Update code/game/objects/items/stacks/sheets/mineral.dm 
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2021-03-23 23:17:24 -04:00
CuteMoff
a51a1ae68f Update mineral.dm 2021-03-23 21:24:11 -04:00
CuteMoff
048b8548ad Update mineral.dm 2021-03-23 20:53:07 -04:00