Commit Graph

69 Commits

Author SHA1 Message Date
MrSky12
6ba955d90c Reapply "Merge branch 'master' into trash-eat-Mk2"
This reverts commit d638582401.
2024-05-15 23:28:30 +02:00
MrSky12
d638582401 Revert "Merge branch 'master' into trash-eat-Mk2"
This reverts commit c82be8287a, reversing
changes made to 8cb3330fef.
2024-05-15 23:03:29 +02:00
Alphas00
c70380f996 Adipoelectric Generator
Added the adipoelectric generator, a machine that takes fat from the person who uses it and turns into current for the wire it's placed on. Unlocked at roundstart
Internal cleanup for the adipoelectric transformer
2024-05-01 17:01:30 +02:00
Aeris Bennet
7c64f8b301 Did as much as I can with adding more GATO branding. 2024-02-09 02:29:29 +00:00
evilew
90c39d76f4 added some donator items
also removed clown technode, you can't build the honker mech anyways
2024-01-26 18:08:55 +01:00
evilew
44d3149a46 small tweaks
- fixed creambeasts and chocoslimes fighting
- added a gym to Xenoarch base
- assigned Fanatic Feeders to Syndicate faction, so the turrets don't do friendly fire
- small bits of GATO reflavoring
- ported Spider Legs (wings slot), gator taul tail and alt naga tail sprite from Virgo
2023-09-27 12:40:01 +02:00
GDLW
31e0a00f9d turbo nutripump, lore notes and minor junk
- calorite research facility has lore notes (plus I added in a lil extra details or items here and there)
- added in the Nutriment Pump TURBO: it will permanently produce a tiny bit of nutriment, slowly fattening whoever has it implanted. It can be made via Nutri-Tech Tools research tree
- feeder's den has fattening turrets now, a beaker of lipoifier and 2 turbo nutripump autosurgeons
- some code cleaning
- added nutripump implant to the uplink
- small tweaks (fixed typos, changed names)
2023-05-11 22:25:07 +02:00
Sonoida
8b47da5e5c nutritech research tree is finished
:D
woo
(mostly just tweaked values in this commit)
2023-03-20 12:21:07 +01:00
Sonoida
98edf50243 whole lot of random shit lol
- the nutritech nodes are functional now
- more tweaks to necropolis loot crates
- fixed ruin of gluttony
- added special "fatoray scraps" which can be used to reveal research nodes for nutritech
2023-03-20 11:51:13 +01:00
Sonoida
56491d8dca new gun!!
calorite cannon + other small tweaks, continuing to work on calorite research
2023-03-14 01:05:20 +01:00
Sonoida
59cdacd0b5 lil fix
nothing worthwhile, just  keeping this for later
2023-03-12 19:39:45 +01:00
Sonoida
8ec0a931f0 added presets, continuing work on research tree
also added a new fatoray sprite, thank you Ambassadoing
2023-03-08 16:15:46 +01:00
Sonoida
12108520f1 starting work on nutri tech
research trees work + exclusive file for nutri tech

also fixed the fatoray sprite a bit
2023-03-08 14:45:37 +01:00
KabKebab
b5954ec132 re-added clown tech to the research tree 2022-10-04 13:10:01 +02:00
Dahlular
15150c056a Temporarily Removes Drones, replacing later 2021-09-24 16:43:26 -06:00
Azarak
fe39ee1533 Ranged analyser 2021-07-19 14:34:37 +02:00
kevinz000
89a56e8f35 Merge pull request #10569 from keronshb/RemoteMoodResearch
Ports the Nanite Remote, Nanite Mood Programs + Rebalance, and the Research Generating Nanites
2021-06-04 14:39:09 -03:00
kevinz000
dd45aece5b Merge pull request #10330 from keronshb/keronnanite
More nanites from /tg/station
2021-06-04 14:17:33 -03:00
Archie
737685ca7f Cybernetic stomachs 2021-06-03 03:48:02 -03:00
silicons
45b2014369 Ports bluespace pipes from yogs 2021-05-23 18:42:40 -03:00
QuoteFox
b6b71a5b0f H.O.N.K mech, admin spawn only. 2021-04-27 00:40:38 +01:00
CygnusB
9ba7d398f6 Revert "Revert "Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie""
This reverts commit 8cda8bbd16.
2021-01-19 17:48:12 -03:00
CygnusB
17d7425417 MWS Microbatteries into techweb / sec techfab 2021-01-19 17:46:34 -03:00
CygnusB
8cda8bbd16 Revert "Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie"
This reverts commit 1945c166b4, reversing
changes made to c8d20ea83c.
2021-01-19 06:40:28 -03:00
Archie
41540397db Fixes a bunch of fallout 2021-01-16 16:12:38 -03:00
QuoteFox
9c1abdd9b4 Merge pull request #871 from Grant4455/master
Research fix for arcade machines and the Autoylathe
2021-01-15 20:36:18 +00:00
QuoteFox
83567cf685 Ports techweb backend refactor & co.
from https://github.com/Citadel-Station-13/Citadel-Station-13/pull/9737
2021-01-15 18:28:36 +00:00
Edward
f8e852c6c9 Update all_nodes.dm 2021-01-13 20:28:18 -06:00
Edward
1a57be3bfd Update all_nodes.dm 2021-01-13 07:35:24 -06:00
BlackMajor
4b8b03fea0 Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled. 2021-01-05 16:32:02 -03:00
kevinz000
7f2de64be7 RCD Update Sync 2021-01-04 18:13:02 -03:00
kevinz000
b21c65055a Surgery fix package 2021-01-02 19:03:45 -03:00
kevinz000
10069637a5 Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2020-12-30 00:42:50 -03:00
kevinz000
c27dbcaf5f Merge pull request #9522 from Linzolle/tend-wounds
Tend Wounds + Make Revival more accessible
2020-12-27 04:27:29 -03:00
Archie
5710e12cb5 Surgery ports 1 2020-12-27 04:25:28 -03:00
Ghom
7a8fcf77d4 ATMOS Firelocks and more 2020-11-19 11:04:04 -03:00
Dip
dbc0d7c1a0 Large beakers to department lathes, large hypovial research 2020-11-05 16:09:38 -03:00
Dip
2b45cd536d adv hypo design 2020-11-03 04:37:45 -03:00
kevinz000
45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
deathride58
cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
kevinz000
6378761217 Merge pull request #10522 from Hatterhat/syndi-sleeper
printable syndicate sleepers - this is blackmajors fault im not gonna lie
2020-10-15 18:16:14 -03:00
Unknown
7e7848fa8b adds slave implant to techweb 2020-09-01 20:29:50 -05:00
Improvedname
78786b28da ff 2020-03-22 19:17:51 +01:00
Improvedname
f376b64f31 AAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-03-20 22:50:57 +01:00
Vladin Ampora
4dc24aaa51 New all_nodes.dm!
No typos or grammatical errors in illegal ballistics now. I bet you feel pretty dumb, huh?
2020-03-11 11:27:03 -04:00
Vladin Ampora
bd919e71b4 THIS ONE STILL HAS A GRAMMATICAL ERROR
ooof ouch bye bye
2020-03-11 11:22:10 -04:00
Vladin Ampora
1434c7631d New file without the typo! I hope!
Should be good now.
2020-03-11 11:15:56 -04:00
Vladin Ampora
0de17d2152 BEGONE TYPO FILE!
Has typo, replacing with non typo version!
2020-03-11 11:14:12 -04:00
Azarak
9931130e26 update 2020-01-29 13:17:23 +01:00
Azarak
e63c7b37f3 RCD update 2020-01-29 12:45:53 +01:00