Commit Graph

344 Commits

Author SHA1 Message Date
kevinz000
73b0ac7859 Emagging a R&D console now unlocks it and prevents it from being locked as opposed to nothing (#37937)
* rdconsole emagging

* Fix grammar
2018-05-21 02:38:44 -05:00
iksyp
aae6ea0203 [READY] Gives Stacking Machines and their consoles machine boards (#37607)
* patch-2

* does everything on the TODO list

FUCK YEAH
*breaks up the engineering node design ID's for readability
*linking the device via multitool is possible
*The machinery construction "recipes" are less shit and make a bit more sense

* coil

* did somebody say RUNTIMES?

*fixed runtimes when there is no link on the stacking machine console
*added feedback for unlinked consoles
*it's -> its
*proper typecheck

* achieved with [src]
2018-05-19 16:39:45 -05:00
AlexTheSysop42
ce400e716c Fixes experimentor pickweight and goo runtime (#37822)
The experimentor is less likely to produce food when it transforms an item

The experimentor no longer breaks when the toxic waste malfunction occurs multiple times and isn't cleaned up

The experimentor irridiate function actually chooses what item to make properly rather than picking from the start of the list


The food weight change is because the probweight var wasn't effective because food was added to the list before anything that would increase the var, it's so low because there's a ton of food and it should be possible to get other things. I tested it in game and food is still the most common thing to get, I could bump up the prob for non-food things if needed.

The toxic waste runtime would make the experimentor unfixable except for reconstructing, and that resets the experiments.

The previous method of picking was broken and pretty poorly coded, I moved it to an associative list and the existing and non-broken pickweight function (not sure if this is also a code change).
2018-05-19 04:48:27 -05:00
Dax Dupont
eb29d86c5f Fixes wrong circuits (#37853)
* Fixes wrong circuits

* this too
2018-05-16 12:04:54 -05:00
Jordan Brown
9a1dfefb97 Merge pull request #37810 from 81Denton/techweb-electronics
Adds basic electronics to techwebs
2018-05-14 15:17:00 -05:00
LetterJay
f9f42658e1 Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-14 12:28:41 -05:00
FrozenGuy5
e9ef82513c Add plasma rein glass to the ORM & adjusts material values on the various glass sheets (#37464)
* Update smelting_designs.dm

* Tweaks material values on titanium glass.

* Optimizes math & fixes errors and inconsistencies
2018-05-13 06:13:36 -05:00
LetterJay
cbfa3053ee Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558
[MIRROR] Anomaly Armour Research
2018-05-12 21:36:51 -05:00
Tad Hardesty
021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
Tad Hardesty
111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
KorPhaeron
cc8fb19166 Anomaly Armour Research 2018-05-09 15:55:03 -05:00
Jordan Brown
7104f28ed8 Merge pull request #37651 from 81Denton/donksoft-board
Adds missing donksoft vendor board to illegal tech node
2018-05-05 08:11:04 -05:00
LetterJay
0c5912c834 Merge pull request #6635 from Citadel-Station-13/upstream-merge-37626
[MIRROR] You can no longer print infinite ammunition.
2018-05-04 22:54:00 -05:00
CitadelStationBot
d574fc5590 Merge pull request #6622 from Citadel-Station-13/upstream-merge-37289
[MIRROR] Science can now print off processors as well
2018-05-03 09:07:59 -05:00
Dax Dupont
a8a31c9e4b You can no longer print infinite ammunition. (#37626)
* You can no longer print infinite ammunition.

* henk

lazy

anus

Reduces .38

Casings now give a tiny bit of metal so the janitor gets a buff

spacing
2018-05-03 08:45:17 -05:00
pigeons
2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
Grandmother of 50
26fa3e1d12 Update machine_designs.dm (#37289) 2018-05-02 16:12:28 -05:00
deathride58
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
deathride58
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 Brown
bf0fe93f35 Merge pull request #37556 from 81Denton/techweb-sunglasses
More holosigns for techwebs
2018-04-30 12:48:12 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
erwgd
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
deathride58
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
LetterJay
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
81Denton
b368ab377b fixes obj descs and adds new ones (#37483) 2018-04-27 13:21:08 -05:00
Dax Dupont
4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
oranges
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
deathride58
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
deathride58
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
deathride58
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
imsxz
e2aa213a52 BADBADBADBADBADBADBADBADBADBAD (#37452) 2018-04-27 04:14:11 -05:00
LetterJay
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 Brown
4838bfec4e Merge pull request #37407 from Fox-McCloud/circuits-reagents
Removes Acid from Remaining Circuits
2018-04-26 15:24:26 -05:00
Dax Dupont
9015cdf172 Makes the experimentor only output one copy of something. (#37313) 2018-04-26 08:01:46 -05:00
Dax Dupont
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
iksyp
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
vuonojenmustaturska
fd521dbe1f Fixes bluespace cookie centcom exploit 2018-04-15 12:38:26 -05:00
Tlaltecuhtli
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
Poojawa
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
Tlaltecuhtli
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
deathride58
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
Jalleo
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
Poojawa
3d03024cef Update all_nodes.dm 2018-03-26 04:39:34 -05:00
oranges
3a93b7e75a Fixes consoles 2018-03-26 02:30:18 -05:00
Poojawa
7b6eee42ce Update all_nodes.dm 2018-03-22 19:36:41 -05:00
CitadelStationBot
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
Tlaltecuhtli
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
CitadelStationBot
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