Commit Graph

18 Commits

Author SHA1 Message Date
SkyratBot
6f1ab2f231 [MIRROR] Ordnance Content Update: Scientific Papers [MDB IGNORE] (#11862)
* Ordnance Content Update: Scientific Papers

* Feex

* Updated our modular maps to not be missing equipment

* I also forgot to fix that in another PR, I'm too lazy to open a new one to fix it

* Yikes

* I forgot Journey

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-03-07 17:59:39 -05:00
Tom
b3f03c7c14 https://github.com/tgstation/tgstation/pull/64417 (#11309) 2022-02-06 21:21:34 +01:00
SkyratBot
7d20cfe603 [MIRROR] Fixes an already fixed experiment discount price calculation bug [MDB IGNORE] (#10043)
* Fixes an already fixed experiment discount price calculation bug (#63336)

* Fixes an already fixed experiment discount price calculation bug

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
2021-12-13 00:34:06 +00:00
SkyratBot
fbf9834686 [MIRROR] Removes dead code in techwebs, alongside some truly evil macros [MDB IGNORE] (#8652)
* Removes dead code in techwebs, alongside some truly evil macros (#61936)

fuck you kevin

* Removes dead code in techwebs, alongside some truly evil macros

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-10-08 08:28:05 -04:00
SkyratBot
124ddd7cca [MIRROR] tgui Preferences Menu + total rewrite of the preferences backend (#8153)
* tgui Preferences Menu + total rewrite of the preferences backend

* nah, we dont need to ping those people

* trying to remove the funny stuff

* unmodularizing this

* prefs reset

* this may need to be reverted, who knows

* okay, this part

* perhaps

* EEEEEEEEE

* unsanitary

* E

* Stage 1 + loadout system

* more fixes

* E

* I mean, it launches?

* More fixes and reorganisation

* E

* customisation code is spaget.

* disable ERP prefs

* Update erp_preferences.dm

* Update erp_preferences.dm

* E

* Slowly getting there

* It may be time for help :)

* tri...colors... help

* preferences now pass preferences

* Update dna.dm

* Fuck this man

* missing savefile return, set_species works, removed dumb stuff from updateappearance

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8199

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8224

* https://github.com/tgstation/tgstation/pull/61519

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8278

* e

* le butonAZARAK HELLO

* hhh

* Proper recognition where it's due, MrMelbert!

* EEEE

* examine block

* Better gen hit sounds from whitedream

* final loadout touches, more bug fixes im sure to come

* i said there would be bugfixes

* Update LoadoutManager.js

* Missing preferences in the html menu

* LIVE TESTING PHASE BABY

* Update LoadoutManager.js

* EEE

* LAUNCH TEST FIRE

* Update job.dm

* Update new_player.dm

* 50gb DAY ONE PATCH

* EEE

* Update preferences.dm

* buggle fixes

* Update examine.dm

* >LOOC starts on

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-09-23 00:40:37 +01:00
SkyratBot
e50fd9551a [MIRROR] Fixes RnD experiment discounts applying indefinitely (#8059)
* Fixes RnD experiment discounts applying indefinitely (#61258)

Discount experiments have been decreasing required points for nodes indefinitely, resulting in research costs being like Industrial Engineering here:

Curiously, this didn't mean free research points for reasons unknown to me.
I believe this has been going on for the entire lifespan of Experisci and nobody reported it. Yet here I am, an RnD main fixing something that's my lifeblood.

Discounts aren't supposed to grow into 1450%+ discounts over time.

RnD discount experiments now reduce the proper amount of points needed instead of gradually growing into a 100% free tech node.

* Fixes RnD experiment discounts applying indefinitely

Co-authored-by: Sealed101 <75863639+Sealed101@users.noreply.github.com>
2021-09-08 15:45:57 +01:00
SkyratBot
e5ff997ef8 [MIRROR] Experi-Sci: Techweb nodes may now require you to perform "scientific" experiments (#3614)
* Experi-Sci: Techweb nodes may now require you to perform "scientific" experiments

* Update all_nodes.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-23 21:51:28 +00:00
SkyratBot
b332b46b65 [MIRROR] Remove hideous inline tab indentation, and bans it in contributing guidelines (#3394)
* Remove hideous inline tab indentation, and bans it in contributing guidelines

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 15:32:02 +00:00
SkyratBot
c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
SkyratBot
82a83b3e03 [MIRROR] Removes an unused variable (#555)
* no colors anymore, I want it painted reeeeed (#53214)

* Removes an unused variable

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-08-29 20:29:45 +01:00
jdawg1290
62676e72a8 Force LF line endings with gitattributes and convert repo (#52266)
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-07-16 03:02:40 +03:00
ArcaneMusic
e39eea7b17 [Ready] Adds a new RnD method, the B.E.P.I.S. (#48040)
* Squashes Commits, has BEPIS, Techs, TGUIs, Rewards, and fixes.

* Makes rewardable techs a variable in all_nodes, and removes RnD Points rewards from the minor reward pool.

* Fixes conflict with pubby and beam icon.

* Review comments and basic cleanup A

* Review Comments and basic cleanup B, also cleans up icon states to work fluidly.

* Map Update

* Indentation, flipped Update_decal_path, and rebuilds tgui

* One last clean up of icon_state, adds the last bit of changes from review, and that should be everything.

* Alright last change for real I swear 105%

* Last change, adds simple sanity check for silicons.

* Moved Human and card variables into ui_interact.

* Fixes map conflict

* Alright Review Round 2 Part A, Fixes Grammar, splits polycircuit into it's own file, UI QOL improvements, Withdrawing credits, changes from arbitary values on the mini RLD, etc.

* More review bits, Part 2:B. Easier returns for less processing, Defines, fixes the merge conflict and updates the UI with new buttons. Just need to figure out Button Mapping for the UI and Duplicate prevention.

* Implemented duplicate tech protection. Yeet.

* Get back in there you

* Alright why are you breaking on me god damnit.

* It's optimized, closer to god, nearly perfect, all together it's ready to ship.

* Cleans up all of the decal painter, shorter, cleaner, works around all the turf_decal quirks.

* Tab spacing on github will look fucky

* More review changes.

* Uses use_power == ACTIVE_POWER_USE instead of powered except for the UI
2019-12-25 23:48:28 +01:00
spookydonut
4e8ff18b07 Fix Travis grep script to use PCRE to actually match things (#47065)
Several of the greps were missing the `-P` switch which caused them to 
fail to match things. The EOL grep also wasn't working right so I 
replaced it with the one I added to TGMC.
2019-10-19 10:21:05 -07:00
Hulkamania
dcc9065fd4 Add a new Emergency Shuttle, Transport Zeta (#45100)
Adds a new abductor themed shuttle to the game, available for 8k 
credits! The shuttle is only unlocked after alien technology has been 
researched!

The shuttle offers some unique items and layout compared to others 
currently available. Two singular entrances with the brig in the back 
means security needs to walk prisoners to the brig area to secure them. 
Unique unlock mechanism encourages either bringing alien tech back from 
Lavaland or stealing some from an abductor.

A few unique items aboard, including alien tools, the experimental 
cloner, and a void core can provide interesting opportunity if utilized 
in the window of time that the shuttle is on station.
2019-07-13 19:58:13 -07:00
kevinz000
4116f7ec79 Techwebs Backend Refactor - Removes references from techwebs and uses IDs instead (#40596)
Yeah yeah I know no opening too many WIP PRs but this one's [ready] and I want to make sure any furthur techweb development doesn't keep using the old reference system which will make refactoring it harder, and this makes it easier for coders to do stuff in theory (at least for me), standardizes getting a node/design, and makes stuff actually GC properly.
2018-10-06 07:52:07 +13:00
kevinz000
7e6f361e01 Refactors techwebs to have different types of points (#37448)
PR HAS NO GAMEPLAY IMPACT
2018-05-19 16:51:14 -07:00
Tad Hardesty
219328cd7a Overhaul and fix destructive analyzer menu 2017-11-28 17:59:42 -08:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00