shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,041 Commits 5 Branches 0 Tags
0ca61af62ae4f01ee61fa4dfeba438b572d1ebf5
Commit Graph

9538 Commits

Author SHA1 Message Date
qweq12yt
0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
Lin
0c77834c56 Merge pull request #14733 from qweq12yt/misc-fixes 
[Fix] Even More bug fixing
 2021-05-19 14:49:00 -05:00
qweq12yt
ba20b5b8aa fix emag shuttle order 2021-05-17 18:48:01 -03:00
WanderingFox95
502092f284 changed sound path 2021-05-17 12:40:37 +02:00
WanderingFox95
1d56b9ceda E-Fink 2021-05-17 12:31:46 +02:00
Timothy Teakettle
739b7cea26 borg spraycans have a five second delay before being able to knock someone down again (#14627) 
* Update crayons.dm

* Update crayons.dm

* kevin review changes

* Update crayons.dm

* Update code/game/objects/items/crayons.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-05-14 17:47:40 +02:00
silicons
5601badbff deterministic explosion system (#13392) 
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
 2021-05-12 05:44:53 -05:00
LetterN
57044515d2 fixes-emag-on-console 2021-05-09 21:39:26 +08: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
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
silicons
97dcfd0750 Update effects_foam.dm 2021-05-06 02:02:25 -07:00
silicons
6ac964b35a e 2021-05-06 01:52:35 -07:00
SandPoot
6bd5707a63 found it 2021-05-06 02:50:32 -03:00
zerothebigboy
c8ebe720ec k 2021-05-05 18:25:05 -04:00
zerothebigboy
5138d86655 skylarlineman'safurry 2021-05-05 03:35:25 -04:00
The0bserver
f1109c4f67 what a crate day (initial commit) 2021-05-01 02:15:07 -04: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
4f73557168 Merge pull request #14647 from SandPoot/limb-grower-tgui 
Ports TGUI limb grower from tg
 2021-04-28 21:20:01 -06: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
WanderingFox95
b27c043760 Fixed a little error 2021-04-26 18:54:12 +02:00
WanderingFox95
6c9ead8f1c Adds the Recipe to Wood Crafting 2021-04-26 18:42:33 +02:00
WanderingFox95
b7c8871b69 Adds the Item: Unrolling Pin 
Like a Rolling Pin but somehow the wrong way around.
 2021-04-26 18:40:12 +02:00
SandPoot
f40f4c8257 upload files 2021-04-23 19:30:28 -03:00
SandPoot
e6c23728eb upload files 2021-04-23 12:56:11 -03:00
necromanceranne
0f04bbb23b Ports a significant amount of the tg cybernetic organ code while making some additional changes to their power 2021-04-22 13:06:31 +10:00
The0bserver
7e92781e93 Improved Cigarette Case Handling 2021-04-21 11:50:41 -04: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
BlueWildrose
911d8ffc12 requested changes 2021-04-18 18:02:04 -07: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
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
DeltaFire
9e88139433 no 2021-04-16 01:07:46 +02:00
Lin
e07854f3c3 Merge pull request #14605 from DeltaFire15/tank-dispensers 
Fixes tank dispensers being unusable by borgs
 2021-04-14 21:39:33 -05:00
Lin
f3ea2d58dc Merge pull request #14602 from BlueWildrose/YoHoYoHofuckoff 
Pirate related fixes and communication console fixes
 2021-04-14 21:39:06 -05: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