shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,227 Commits 5 Branches 0 Tags
ca3eaca3148821007a4d9a0b50dbdf8d2e893fd1
Commit Graph

6201 Commits

Author SHA1 Message Date
SandPoot
ca3eaca314 update bedsheet_bin.dm 2021-11-15 20:48:11 -03:00
SandPoot
5b85c260a7 Upload files 2021-11-15 01:34:30 -03:00
silicons
5b5eca2beb Merge pull request #15322 from SandPoot/crayon-precision 
Crayon precision mode
 2021-11-09 09:56:03 -08:00
Lin
74c6e05dd7 Merge pull request #15318 from silicons/evil 
removes some evil defines from the code
 2021-11-04 04:32:48 +00:00
SandPoot
d92a290960 Update crayons.dm 2021-11-01 01:50:30 -03:00
SandPoot
05717c7ae3 Upload files 2021-11-01 01:24:47 -03:00
Lin
b6ad2f6a6b Merge pull request #15312 from keronshb/evergreen 
The grinch can no longer steal Christmas.
 2021-10-30 14:08:59 -07:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
silicons
319c5e23fe Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not 
Revert "TGUI alerts, lists, inputs"
 2021-10-29 20:27:46 -07:00
Lin
5054ea87ce Merge pull request #15310 from keronshb/jaqincinerator 
No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
 2021-10-28 21:29:50 -07:00
keronshb
e531c7b452 Fix 2021-10-28 18:48:26 -04:00
keronshb
6dcf4fae9f No stealing christmas 2021-10-28 11:28:59 -04:00
keronshb
e8c56c07ee No burning the spirit of halloween 2021-10-28 00:43:02 -04:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
silicons
9010dc1e41 Merge pull request #15298 from keronshb/whocodedthis 
Fixes DSword and Hyper Eu's wounding, and fixes a slowdown bug with Hyper Eu.
 2021-10-27 13:35:41 -07:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
silicons
679189cb3d Merge pull request #15277 from Hatterhat/autoloom 
i've been sitting on this a while but here have the AUTOLOOM
 2021-10-27 05:13:40 -07:00
silicons
cbc266214d Merge pull request #15303 from Linzolle/ghostcafe-plasma 
make plasmemes not die in ghost cafe
 2021-10-27 05:12:22 -07:00
silicons
d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal 
Removes minesweeper
 2021-10-27 05:11:48 -07:00
WanderingFox95
4b13d1772c [Ready] Bone Anvil and processable Bone ingots (#15290) 
* Adding all the extra stuff

* whoops, slipped my last fix in here.

* bone balance

* 6 Goliaths + 3 Watchers + 1 Legion

* bumps the damage modifier down to 1.05

* More Bones.

* Undoes the undoing of the other fix PR

Co-authored-by: Emily <null>
 2021-10-25 18:11:54 +02:00
Linzolle
a4a72b1b16 make plasmemes not die in ghost cafe 2021-10-24 17:27:32 -07:00
keronshb
ff9439d223 Dsword Wound and slowdown fix 2021-10-22 23:04:19 -04:00
SandPoot
45ef0fe5ca closes #15278 2021-10-17 21:40:39 -03:00
SandPoot
1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
Hatterhat
7e7a5af53a brought to you by neilcic - Floor Corn 2021-10-16 05:00:15 -05:00
silicons
d17419ed54 Merge pull request #15256 from keronshb/fatdart 
no idea what this thing even is but he's chuffin back a fat dart and that's all that matters
 2021-10-15 00:18:39 -07:00
silicons
91e7cb293c Merge pull request #15223 from Hatterhat/yeehaw-box 
The Yeehaw Update - makes .38 lever-actions slightly more accessible
 2021-10-11 20:45:42 -07:00
SandPoot
829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03:00
Timothy Teakettle
11df2bb77c fixes emps not working on lockers (#15259) 
* Update closets.dm

* Update code/game/objects/structures/crates_lockers/closets.dm

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

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-10-11 00:48:00 +02:00
Lin
2085279590 Merge pull request #15252 from SandPoot/tooltip-related-fixes 
Tooltip related fixes
 2021-10-08 22:31:23 -07:00
SandPoot
437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
keronshb
e5f66413c8 fat dart 
no idea what this even is
 2021-10-08 17:28:25 -04:00
SandPoot
3de08a74e7 Upload files 2021-10-07 12:32:20 -03:00
Putnam3145
fedf409a5d Merge pull request #15105 from Citadel-Station-13/silicons-patch-7 
comedically controversial stunbaton """"buff""""
 2021-10-07 00:05:45 -07:00
Putnam3145
8be5dba86a Merge pull request #15127 from Citadel-Station-13/silicons-patch-14 
chaplain runspeed holy weapon will now only give a random slowdown/speedup of 6 tiles which for the most part ignores all other slowdowns/speedups, instead of randomizing between slowing to a crawl and running faster than the speed of light
 2021-10-07 00:05:24 -07:00
Chayse Ramsay
76fa85e683 Cyborg module sorting fixed (#15241) 2021-10-06 17:16:10 +02:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
Lin
8f9a2b6d0c Merge pull request #15235 from silicons/pai_radio_Stuff 
redoes how pai emp silencing works
 2021-10-05 12:32:23 -07:00
Lin
b18fbe695a Merge pull request #15233 from SandPoot/misc-fixes 
Some random fixes
 2021-10-05 10:27:19 -07:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
silicons
bac7bc3fb6 fix 2021-10-03 11:29:32 -07:00
SandPoot
1c80169f22 Update shields.dm 2021-10-02 22:35:54 -03:00
SandPoot
95b814d47e Upload files 2021-10-02 22:29:01 -03:00
Putnam3145
dc22e02a1b Removes minesweeper 2021-10-01 23:08:08 -07:00
WanderingFox95
83987db48a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-10-01 18:51:46 +02:00
Hatterhat
1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -05:00
silicons
5ff4a2ace5 Merge pull request #15180 from LetterN/achives- 
Achivement & Clowncar update
 2021-09-28 00:15:52 -07:00
WanderingFox95
d8aa29a16e Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-21 14:49:15 +02:00
Lin
ab7b4e3eec Merge pull request #15181 from Citadel-Station-13/typecaches 
no more powergaming dice bags
 2021-09-20 23:59:53 -05:00
Lin
7a5e748344 Merge pull request #15185 from Citadel-Station-13/silicons-patch-6 
fixes airlock deflection
 2021-09-20 23:53:53 -05:00