shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,186 Commits 5 Branches 0 Tags
7d01eeeb3543f9295cb2e5040ff8e30075763f86
Commit Graph
327 Commits
Author SHA1 Message Date
deathride58andGitHub 7d01eeeb35 Merge pull request #6593 from Citadel-Station-13/upstream-merge-37556 
[MIRROR] More holosigns for techwebs
 2018-05-02 01:23:19 +00:00
deathride58andGitHub dca50e5d35 Merge pull request #6575 from Citadel-Station-13/upstream-merge-37349 
[MIRROR] Adds fly and moth categories to limb grower
 2018-05-02 01:21:37 +00:00
Jordan BrownandCitadelStationBot bf0fe93f35 Merge pull request #37556 from 81Denton/techweb-sunglasses 
More holosigns for techwebs
 2018-04-30 12:48:12 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
erwgdandCitadelStationBot 2ca75d7de7 added fly and moth categories to limb grower and limbgrower_designs.dm (#37349) 
only human and lizard synthetic limbs will have should_draw_greyscale set to true

added /improper and uncapitalised synthetic limb names

removed plasmaman parts from human_parts_greyscale.dmi
 2018-04-29 17:52:44 -05:00
deathride58andGitHub 6f13d2c2e9 Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380 
[MIRROR] Refactors and fixes RPEDs
 2018-04-29 22:45:28 +00:00
LetterJayandGitHub c287c3a84c Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483 
[MIRROR] Fixes obj descs and adds missing ones
 2018-04-29 02:29:44 -05:00
81DentonandCitadelStationBot b368ab377b fixes obj descs and adds new ones (#37483) 2018-04-27 13:21:08 -05:00
Dax DupontandCitadelStationBot 4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
orangesandCitadelStationBot ce31767862 Merge pull request #37482 from vuonojenmustaturska/bluepot 
Fixes slime pressurization potion attempting to apply multiple times
 2018-04-27 08:12:10 -05:00
deathride58andGitHub c0bc86ef21 Merge pull request #6533 from Citadel-Station-13/upstream-merge-37452 
[MIRROR] [s]fixes significant invulnerability exploit
 2018-04-27 09:43:11 +00:00
deathride58andGitHub d972ecc891 Merge pull request #6523 from Citadel-Station-13/upstream-merge-37407 
[MIRROR] Removes Acid from Remaining Circuits
 2018-04-27 09:39:29 +00:00
deathride58andGitHub 85f0c174c1 Merge pull request #6520 from Citadel-Station-13/upstream-merge-37313 
[MIRROR] Makes the experimentor only output one copy of something.
 2018-04-27 09:37:33 +00:00
imsxzandCitadelStationBot e2aa213a52 BADBADBADBADBADBADBADBADBADBAD (#37452) 2018-04-27 04:14:11 -05:00
LetterJayandGitHub 72ddaee4a3 Merge pull request #6502 from Citadel-Station-13/upstream-merge-37363 
[MIRROR] Makes radiation collectors buildable
 2018-04-27 00:10:52 -05:00
Jordan BrownandCitadelStationBot 4838bfec4e Merge pull request #37407 from Fox-McCloud/circuits-reagents 
Removes Acid from Remaining Circuits
 2018-04-26 15:24:26 -05:00
Dax DupontandCitadelStationBot 9015cdf172 Makes the experimentor only output one copy of something. (#37313) 2018-04-26 08:01:46 -05:00
Dax DupontandCitadelStationBot d5c2d37e39 Makes radiation collectors buildable (#37363) 
* Makes radiation collectors buildable

* capitalism at it's finest

* a
 2018-04-24 07:13:16 -05:00
Poojawa 5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
iksypandCitadelStationBot e8698ab798 Gives beer and soda dispensers their own circuitboards and Design ID's (#37315) 
* new boards

* new boards installed

* new designs (wow) (woah)

* added the new design ids to the biotech node

* tested

it works, also, that typo fucking stopped it from compiling
 2018-04-22 19:19:51 -05:00
vuonojenmustaturskaandCitadelStationBot fd521dbe1f Fixes bluespace cookie centcom exploit 2018-04-15 12:38:26 -05:00
TlaltecuhtliandCitadelStationBot 3ffe415eb8 sucessfully fixes some grammar (#37095) 
* sucessfully fixes some grammar

/🆑
grammar:fix
🆑

* fixes kevin spelling words in albanian

* tfffaerfvvjjewwaazcb

* does this work

* what if this works

* sdad

* ok
 2018-04-14 08:12:34 -05:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
TlaltecuhtliandCitadelStationBot 4f7d35ec4f fixes #34388 by adding cam (#36627) 
* wip fixes #34388

🆑 
fix:stuff
🆑

* vv

* ASDASD

* daikshu

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* 99999999999999999999999999999

* *tabs*

* Update comp_board_designs.dm
 2018-04-06 09:24:47 -05:00
deathride58andGitHub 5dddb2db45 Merge pull request #6083 from Citadel-Station-13/upstream-merge-36149 
[MIRROR] improves techwebs a bit
 2018-04-03 08:16:59 +00:00
JalleoandCitadelStationBot 8ff1fdd907 Little fix to RPED (#36610) 
* Why use a weird proc to check it than set a static list? Yes one is technically more expensive but better maintainability

* Changes to what Cyberboss suggested (For performance reasons?)

* oranges and Antur make sense with the && False its just a false return instead.

* Man I need to read more areas of the codebase that entire proc being modified was not required with my list change......
 2018-03-28 13:39:18 -05:00
PoojawaandGitHub 3d03024cef Update all_nodes.dm 2018-03-26 04:39:34 -05:00
orangesandCitadelStationBot 3a93b7e75a Fixes consoles 2018-03-26 02:30:18 -05:00
PoojawaandGitHub 7b6eee42ce Update all_nodes.dm 2018-03-22 19:36:41 -05:00
CitadelStationBotandPoojawa 80d5cc2884 [MIRROR] Nerfs monkey spam (#6084) 
* Merge pull request #36380 from vuonojenmustaturska/sauerbraten

Nerfs monkey spam

* Nerfs monkey spam
 2018-03-22 19:31:57 -05:00
TlaltecuhtliandCitadelStationBot e8e9f475a0 improves techwebs a bit 2018-03-22 15:41:18 -05:00
Poojawa b80e7cded9 fixes #5996 2018-03-20 19:18:33 -05:00
CitadelStationBotandPoojawa 7b3b1f65ec [MIRROR] Adds two new intermediate beaker types to chemistry (#6018) 
* Adds two new intermediate beaker types to chemistry

* YAY I DON'T HAVE TO KEEP UP WITH SNOWFLAKE ANYMORE

* Update all_nodes.dm
 2018-03-19 22:17:05 -05:00
CitadelStationBotandPoojawa 3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004) 
* Replaced body zone magic strings with defines

* merge conflicts
 2018-03-19 21:18:57 -05:00
CitadelStationBotandPoojawa 9338d18a28 [MIRROR] Techweb fixes (#6023) 
* Techweb fixes (#36513)

* Techweb fixes

* board

* robo

* Techweb fixes
 2018-03-19 21:18:35 -05:00
CitadelStationBotandPoojawa 0c1fc7ff61 [MIRROR] Gives warning message to holodeck mobs that gain sentience via sentience potions. (#6016) 
* Adds warning message to holodeck mobs that are made sentient. (#36472)

* Gives warning message to holodeck mobs that gain sentience via sentience potions.
 2018-03-19 21:12:21 -05:00
orangesandCitadelStationBot e4c2aae759 Merge pull request #36393 from Polyphynx/slimeradio 
Fixes bluespace radio potions
 2018-03-17 07:53:37 -05:00
deathride58andkevinz000 063abf2a5d Makes xenobio consoles upgradeable via disks obtainable from bluespace research, makes most xenobio console abilities exclusive to disk upgrades (#5953) 
* Makes xenobiology consoles rely on upgrades, spreads out xenobio console abilities into upgrade disks

* Update xenobio_camera.dm
 2018-03-16 10:13:06 -07:00
PoojawaandGitHub 6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
kevinz000andPoojawa 7efceb213e Update _production.dm (#5906) 2018-03-11 22:28:27 -05:00
CitadelStationBotandPoojawa b7e666ff23 [MIRROR] Fixes science scaling to decrease materials rather than increase.... (#5882) 
* Fixes scaling displays (#36253)

* Fixes science scaling to decrease materials rather than increase....
 2018-03-10 06:55:12 -06:00
Mark9013100andCitadelStationBot 2686699c3e Pillbottles can now be made (#36083) 2018-03-09 14:24:35 -06:00
deathride58andGitHub a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055 
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
 2018-03-09 19:25:12 +00:00
kevinz000andCitadelStationBot 91ac70a73e RND TECHWEBS: TECHFABS (#36055) 
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
 2018-03-07 21:11:56 -06:00
Dax DupontandCitadelStationBot 72e3ffa562 Beacons are no longer radios (#36070) 
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
 2018-03-07 14:43:25 -06:00
PoojawaandGitHub 86b11050b6 Citadel's folder's end (#5828) 
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
 2018-03-06 17:40:48 -06:00
CitadelStationBotandPoojawa a2e6253f00 [MIRROR] Disease antagonist (#5815) 
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
 2018-03-05 15:20:59 -06:00
vuonojenmustaturskaandCitadelStationBot e849ab23aa Advanced roasting sticks, for cooking sausages (#36071) 
* stick

* a commit

* almost forgot something

* seems to compile
 2018-03-04 15:41:23 -06:00
CitadelStationBotandPoojawa fdd6b01354 [MIRROR] Increase Cost of Stockpart-related Tech (MULTIPLICATIVE GAINS OK) (#5757) 
* Increase Cost of Stockpart-related Tech (MULTIPLICATIVE GAINS OK) (#35853)

* Update all_nodes.dm

* Lowers lasers to 3K from 5K

* 10K -> 7.5K

* Increase Cost of Stockpart-related Tech (MULTIPLICATIVE GAINS OK)
 2018-03-02 20:08:04 -06:00
CitadelStationBotandPoojawa b40980b0c1 [MIRROR] Fixes hidden node unlocking (#5731) 
* Merge pull request #36013 from kevinz000/techwebs_hotfix_1

Fixes hidden node unlocking

* Fixes hidden node unlocking
 2018-02-28 19:31:38 -06:00