shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,225 Commits 5 Branches 0 Tags
5d4bae4482268e1ffca25afaa6b43f46b054e73e
Commit Graph

1449 Commits

Author SHA1 Message Date
SandPoot
5d4bae4482 Update files 2022-04-10 23:27:12 -03:00
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
silicons
c8cab13081 Merge pull request #15565 from SandPoot/custom-statues 
Custom statues and sculpting changes.
 2022-04-06 12:12:24 -07:00
BlueWildrose
3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304) 
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2022-03-30 20:06:00 -07:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
SandPoot
aec888a7b6 Update files 2022-03-16 15:17:57 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Putnam3145
b597675ef4 Fix explosive compressor impossibility 2022-03-14 11:41:20 -07:00
silicons
a3284a0923 Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf 
Weakens chemistry's revival chems
 2022-03-13 14:24:57 -07:00
silicons
bf9afd846d Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system 
[PORT] Removes the non bitflag slot defines
 2022-02-26 18:08:28 -07:00
silicons
fe427e7516 Merge pull request #15503 from Arturlang/Bodybuilding 
Lets the limbgrower make mobs with only a chest
 2022-02-26 18:08:12 -07:00
SandPoot
f7ea1f377d oops, replace all is a hell of a drug 2022-02-25 17:09:31 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
Artur
fc6f3cdffc tested and done, seems to work 2022-02-11 16:54:05 +02:00
Artur
345c1616f2 Adds a way to build bodies using the limbgrower 2022-02-10 18:49:24 +02:00
DeltaFire
04d806c700 orange 
stabilized orange can now cool at most 5 per tick instead of infinite

robots only cool half, which means 5 per life tick (status effects fire twice per life tick total)

for robots, it cools towards ~ -100°C target temp, provided you are in a location that supports it.
 2022-01-31 00:50:22 +01:00
DeltaFire
074fe5b417 a bunch of stuff 
5° min temp adjustment for active cooling
150% max total cooling efficiency as opposed to 100%
passive heating cools instead at >100% efficiency (to -30°C min)
EMPs jam cooling system readouts.
Nanogel is now printable, for a decent price though it needs a bit of diamond.
 2022-01-02 19:44:35 +01:00
silicons
72a169e336 Merge pull request #15426 from Putnam3145/better-science-log 
Fixes science per-minute output
 2021-12-11 17:46:22 -08:00
Putnam3145
13834847e0 it works better when you're actually using a delta 2021-12-11 17:04:05 -08:00
DeltaFire
50be57f107 grrrr 2021-12-08 18:33:06 +01:00
DeltaFire
04797a961b linters b gone 2021-12-08 05:07:22 +01:00
shellspeed1
76324ed06a Update code/modules/research/designs/medical_designs.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:17:49 -08:00
shellspeed1
71a4b7ba00 Update code/modules/research/designs/medical_designs.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:17:39 -08:00
keronshb
9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
shellspeed1
026ce5dec4 tiny bit more polish, some number tweaks, and research. 2021-10-31 04:18:15 -07:00
keronshb
8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08: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
d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal 
Removes minesweeper
 2021-10-27 05:11:48 -07:00
Hatterhat
9c45c41d4f ae 2021-10-16 18:27:59 -05:00
Hatterhat
f1d5db7983 lol. lmao 2021-10-16 05:02:04 -05:00
keronshb
0bae06adcd Original Port 2021-10-11 22:00:54 -04: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
Lin
3f50e836cc Merge pull request #15238 from DeltaFire15/nanitedefibs 
Nanite defibs now heal oxygen damage akin to defibs, also adds the revival memory policy to them
 2021-10-05 16:25:59 -07: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
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
DeltaFire
97eb42b35b defib policy hook & oxyheal 2021-10-04 15:49:12 +02:00
Putnam3145
dc22e02a1b Removes minesweeper 2021-10-01 23:08:08 -07:00
qweq12yt
4e8b02dd75 restored the serving tray to the autholathes 2021-09-27 17:38:28 -03:00
DeltaFire
7752e0d624 synthtissue and sr 2021-09-22 22:30:43 +02:00
silicons
54993928b2 Merge pull request #15167 from BlueWildrose/regenerativenerf 
Xenobio regenerative extract nerfing - Hold still for 5 seconds to use on others, 1 second for self, adds stackable disgust when used
 2021-09-19 11:08:10 -07:00
silicons
2bf73138fa Merge pull request #15157 from DeltaFire15/nanite-storage 
Storage nanite designs are no longer inaccessible
 2021-09-19 11:07:13 -07:00
Cognition
37c480a7a4 1 second for self-use 2021-09-17 23:12:55 -07:00
Cognition
cd747b01fe realized I can't place it on tables with how I set it up, woops. 2021-09-17 02:59:31 -07:00
Cognition
db511f4d7e Regenerative extract nerfing 2021-09-17 02:23:06 -07:00
DeltaFire
146682d1ee adds storage protocols to bepis 2021-09-16 03:41:49 +02:00
DeltaFire
a4d71fcfa4 -debug comment 2021-09-16 03:18:52 +02:00