shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,880 Commits 5 Branches 0 Tags
b915cdcbb5ebc00aef701e86f8be381bc244574e
Commit Graph

6523 Commits

Author SHA1 Message Date
LetterN
9a24f89780 THE fix 2021-11-10 10:33:15 +08:00
silicons
5b5eca2beb Merge pull request #15322 from SandPoot/crayon-precision 
Crayon precision mode
 2021-11-09 09:56:03 -08:00
keronshb
9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04: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
keronshb
efd12e4fd5 Changes for merge 2021-11-01 12:07:44 -04: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
LetterN
f9ce0759a3 indentation moment 2021-10-30 14:25:44 +08:00
LetterN
89f7cf1c32 i apparently didnt commit this? 2021-10-30 13:46:54 +08:00
LetterN
1fc778f70a soundloop fix. also it gets deleted (woo) 2021-10-30 13:16:31 +08:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
LetterN
a057139c33 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-10-30 11:54:20 +08:00
LetterN
99019166e4 i think it works 
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
 2021-10-30 11:45:50 +08: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
8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
keronshb
c80d65df73 Merge branch 'master' into familyport 2021-10-28 14:34:20 -04:00
keronshb
6dcf4fae9f No stealing christmas 2021-10-28 11:28:59 -04:00
LetterN
f7b898a2a9 frontend 2021-10-28 17:34:52 +08:00
LetterN
49940c373e tgui backend 2021-10-28 12:51:31 +08: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
Artur
bfcdf83e55 buildmode mapgen tool save 2021-10-26 16:31:36 +03: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
keronshb
3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
keronshb
6b23d177c8 Merge remote-tracking branch 'upstream/master' 2021-10-15 19:25:41 -04:00
keronshb
1cd2c59776 Merge branch 'master' into familyport 2021-10-15 14:43:53 -04: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
keronshb
13140f9bb9 Somewhat fixed huds and stuff, not 100% 2021-10-14 16:36:18 -04:00
keronshb
6331ced3e5 The rest of the offering stuff 2021-10-13 22:13:33 -04:00
keronshb
e2ab532de2 Removes old gangs, families is almost ready 2021-10-12 16:34:27 -04:00
keronshb
bd7a2b6a2a Lets families compile 2021-10-12 16:12:38 -04:00
keronshb
41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04: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
keronshb
0bae06adcd Original Port 2021-10-11 22:00:54 -04: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