Commit Graph

493 Commits

Author SHA1 Message Date
vuonojenmustaturska
40657c9ccd removes a bunch of unused/bad helpers (#48969)
* a commit

* Update code/controllers/subsystem/persistence.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update code/__HELPERS/text.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update advance.dm

* Update security_officer.dm

* Update text.dm

* Update unsorted.dm

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2020-01-28 16:22:20 +01:00
Tlaltecuhtli
d29d87630c adds constable outfit in cargocrate (#48748)
🆑
add: contraband crate with british police outfit
/🆑
why is it good for gaming:
now they can buy thematic items and sec can do fun rp

description of what is added:
items added in the security vendor:
an hat with same properties of the helmet
a suit with same properties of normal sec suit for
a whistle with 10s cooldown
a pair of white gloves
a conversion kit which can turn a stun baton in a crappier police baton (no free batons and no "upgraded versions*")
for 1100 credits

prices are so sec can buy the whole reskin kit within 20 minutes of the round

tl note: police baton is more garbage than the roundstart free sec baton its for thematic rp
2020-01-27 23:41:40 +13:00
Rohesie
7bef84f009 Mass-replacement of stat to machine_stat (#48758)
Living and machine stat vars are pretty different, one uses flags and other number-defines.
This should make some other mass-replacements and searches a bit easier.
2020-01-24 12:37:17 +13:00
skoglol
4734de3805 Adds a launch random item option to the podlauncher (#48886)
About The Pull Request

Adds the option of picking a random item from the turf and sending it instead of sending the entire turfs contents. Helpful in situations where you dont want to send clones, but also want to spread out the items sent.
Why It's Good For The Game

Happy admins, happy life.
Changelog

🆑 Skoglol
admin: Podlauncher now supports sending a single random item instead of the entire turfs contents.
/🆑
2020-01-23 13:12:03 +13:00
MrPerson
26093e5ac2 Further update_icon splitup (#48784)
* Further update_icon splitup

After this there'll be just under 100 old update_icon() calls that need fixing.

* Thanks Travis
2020-01-22 10:18:05 -05:00
spookydonut
3195ceaa22 Update SpacemanDMM suite to 1.2 (#48785)
* Update SpacemanDMM suite to 1.2

* Fix new lint errors
2020-01-16 11:49:39 -05:00
Nick
63b9cf1e7a [Ready]Adds fireworks to contrabrand lootpool(WE SMUGGLIN FIREWORKS BOIS) (#48658)
* Update packs.dm

* Makes it normal

* Update packs.dm
2020-01-10 22:09:54 +11:00
TheChosenEvilOne
c851f1aebe Actually perhaps remove the money?
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2020-01-03 16:46:58 +02:00
TheChosenEvilOne
9544ed5ae2 Reviews
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2020-01-03 16:40:17 +02:00
TheChosenEvilOne
c96a81469b Merge remote-tracking branch 'origin/master' into market 2020-01-03 16:15:14 +02:00
ArcaneMusic
39b58f1edc Adds several more uses for plastics (Trinkets, Trash, Decor, and Killing the Environment) (#48337)
* Initial Commit, Plastic Boxes and Soda Rings. Basic carp interaction.

* Beads, trash created from breaking plastic, carp eat plastic properly.

* Cleans up sprites, adds designs to autolathe, and adds plastic plants

* Icon Conflict more like Ion Comblict because I can't spell

* Oh neat, there's already a party crate. Added Beer/Soda 6packs to the crate, adjusted price accordingly.

* Aaaaaaaaaa runtime loop.

* You win this round travis.

* Makes the in-hand sprite the soda can sprite because honestly it's close enough don't @ me

* Typo.

* Merge conflict, style changes, FINE CARP DON'T BREATHE.

* BEGONE CONFLICT BEGONE FROM ME
2020-01-03 02:13:43 +01:00
TheVekter
da2b817e44 [READY] Moves Genetics to the Science department and makes Gen… (#48397)
* great googly moogly it's all gone to shit

* Fixed geneticist ID, moved in job list

* This is what I get for not building

* Fixed HUD sprite

* Finalized move to R&D code areas and updated sprites

* Mapping fixes on Meta

* Boxstation's turn and some Meta fixes

* Fixing map conflicts

* Moves genetics to science

SQUASHED:

great googly moogly it's all gone to shit

Fixed geneticist ID, moved in job list

This is what I get for not building

Fixed HUD sprite

Finalized move to R&D code areas and updated sprites

Mapping fixes on Meta

Boxstation's turn and some Meta fixes

Fixing map conflicts

* lmao travis

* okay you can pass travis this time

* DeltaStation changes

* lmao access bullshit

* Kilo also a few code/sprite fixes

* Pubbystation

* Removed gondolas because people hate fun
2020-01-02 06:15:35 -08:00
TheChosenEvilOne
249a2382b9 TUI-NZTX + 1 credits cr
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-30 13:22:00 +02:00
TheChosenEvilOne
1ff950f6a7 Merge remote-tracking branch 'origin/master' into market 2019-12-29 16:18:18 +02:00
cacogen
6b63bf7093 Changes $1 to 1 cr (#48414)
* $ to cr

* Payday messages use a proper span instead of asterisks
2019-12-28 16:29:36 +02:00
TheChosenEvilOne
34ff2d026a coder sprite
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-26 19:57:43 +02:00
TheChosenEvilOne
dc56886ef4 a 2019-12-22 11:44:13 +02:00
wesoda25
a78788fbbd weewoo (#48322) 2019-12-22 09:33:09 +01:00
AnturK
9dd3da4445 Batch of runtime fixes. (#48268)
* Abductor implant runtime

* Point blank knockback runtime + cleanup

* dog food begging runtime

* Malf power loop runtime

* Explosive gondola pod runtime.

* Plasma shard runtime and related.
2019-12-21 18:40:10 +01:00
TheChosenEvilOne
c269caa370 Merge remote-tracking branch 'origin/master' into market 2019-12-20 20:30:22 +02:00
TheChosenEvilOne
d00c8a1a92 Changed some prices.
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-20 20:28:44 +02:00
Coconutwarrior97
d6422e03be Return of The New Donk Pockets 2: Electric Boogaloo (#48310)
* Adds new donk pockets and new donk pockets boxes icons and code!

* Accidentlty didn't add the pastries, oops!

* Adds the new donk pockets to the maint loot table, a donk pocket crate, and fixes a small typo under boxes which caused the honk pocket box to not appear.

* Final commit before PR, fixed a few bugs.

* Fixed a spelling error, and removed Gondola-Pockets from the maint loot table.

* Adds a new donk pocket loot spawner object, and updatesmaps to include it in the kitchen.

* Proper mapmerge, hopefully.

* Removed step_x and step_y, hopefully travis will be happy now.

* Switches out the new donk pocket icons for less noisy ones.

* Removes unnecessary lines of code.

* Adds craftable donk pocket boxes.

* Hopefully makes travis happy by fixing metastation errors.

* More metastation error fixes.

* Changes omnizine of warm honk-pocket to 1.

* Add path variable donktype, removed copy pasted populatecontents() lines of code.

* Fully working with removal of the copy pasted populatecontents() in favor of a path variable.

* Gets rid of component initialize where it does nothing

* Fixed some data loss with food icons.
2019-12-20 09:02:47 +01:00
tralezab
82f7330833 ice peppers renamed to chilly peppers (#48289)
* 1

* 2
2019-12-18 20:20:23 -05:00
AnturK
54f32f26ad Fixes few minor runtimes. (#48234)
* Fixes emagging stuff without user

* Fixes missing initalizes

* Fixes deconstructing for materials

* Fixes tracker bullets runtime.
2019-12-14 14:15:15 -05:00
moo
93cf35b818 Some minor Ecobbomy items (Paystand Functions, Merchant Necklace for Admins) (#48205)
* 💰

* round

* added better feedback

* 150 hours

* 151 hours

* Update code/modules/economy/pay_stand.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* Update _neck.dm
2019-12-13 10:30:10 -05:00
TheChosenEvilOne
ad5c9faa7c Make sure the user is still near the uplink after input.
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-13 00:29:20 +02:00
TheChosenEvilOne
ad36339586 Items now actually get added to the market.
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-12 22:07:41 +02:00
TheChosenEvilOne
d4b935e429 UI improvement, I guess
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-12 18:24:09 +02:00
TheChosenEvilOne
08619b9418 Merge remote-tracking branch 'origin/master' into market 2019-12-12 18:14:38 +02:00
TheChosenEvilOne
97cd9d9f64 self review best review
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-12 18:13:44 +02:00
spookydonut
175439f63a Removes unreachable code (#48143)
About The Pull Request

As detected by SpaceManiac/SpacemanDMM#123
2019-12-10 20:52:13 +13:00
TheChosenEvilOne
8b24c2e6cf src.src.src.src.src
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-04 17:53:27 +02:00
TheChosenEvilOne
fa34a092ea fixes to comments & doc & log.
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-04 17:30:49 +02:00
TheChosenEvilOne
a6df948028 useBackend + text formating
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-03 22:38:38 +02:00
TheChosenEvilOne
d4320c76df Some fixes, also travis work now or I will hit you.
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-03 21:53:56 +02:00
TheChosenEvilOne
f35b16699f Trailing newline...
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-03 21:34:30 +02:00
TheChosenEvilOne
088d0ad1b3 Merge remote-tracking branch 'origin/master' into market 2019-12-03 21:21:25 +02:00
TheChosenEvilOne
7dc8423fb0 Remove unused selling file and decreases shipping cost.
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-03 20:39:00 +02:00
TheChosenEvilOne
765ea2a4b6 hhhhhhhhhh
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-03 20:34:43 +02:00
TheChosenEvilOne
808e1556ea Uplink crafting recipe
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-11-29 21:21:59 +02:00
TheChosenEvilOne
9d92aa7225 Initial Blackmarket Commit
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-11-29 21:12:00 +02:00
Tlaltecuhtli
cda2867984 conveyor belt now are stacks (#47656)
* | || || |_

* weight and prints
2019-11-26 22:58:16 +01:00
ArcaneMusic
d7c6471aa8 Adds 2 Suspender Subtypes, gives suspenders a new toggle, and adds Mystic Robes (#47821)
* Blue, Gray suspenders

* Adds suit toggle for X-Y suspenders for some reason

* Psijic monk robes and hood, toggles, all good to go.

* Cleans up magic pixels, tones down colors.

* Inhand sprites are in.

* Suspenders exist on the map somewhere

* BEGONE FORELORN PIXELS OF YORE
2019-11-25 23:12:05 +01:00
Aleksej Komarov
e87b6c6701 Tgui error reporting, Keyboard passthrough, RPD, NtOS, Power Monitor (#47749)
* Improve tgui fatal error reporting

* Keyboard passthrough in tgui

* New Rapid Pipe Dispenser interface

* Update README with new components

* Release held keys when browser window loses focus

* Power Monitor Interface, NtOS theme and core components

* Yet another CSS rework

* Fix Table, Chart stubs for IE8

* NtOS Main interface

* Supermatter Monitor interface

* Tweak NT color, color + sort gas bars
2019-11-16 04:02:33 -08:00
Firecage
ff42a1590b Ports carbon paper from Bay. (#47691)
* Ports carbon paper.

* Can't fold stacked carbon paper into paperplane.

* Changes some update_icon()'s into update_icon_state()'s

* Does as Action asked.

* Return is returned to the box from whence it came.
2019-11-14 02:56:35 -08:00
Rob Bailey
8ea3632a96 global to static (#47580)
* global to static

* get rid of a dead var
2019-11-06 19:49:20 +01:00
spookydonut
2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
Tlaltecuhtli
2c81143d69 add chem factory related cargo bounty (#47315)
* Update maps.txt

* 1

* 2

* doc

* d
2019-11-02 19:37:28 -04:00
nemvar
372189aad8 Prevent prevent contents explosion proc (#47337)
About The Pull Request

Proc literally only existed to return a boolean. Contents explosion is a clusterfuck anyhows. Basically it works something like this:

If the turf is the epicenter: GetAllContents of the contents and call ex_act on them directly. But it doesn't get the contents of whatever returns true on prevents_contents_explosion.
Otherwise: Call ex_act on the turf which calls the contents_explosion proc which has nothing to do with the prevents_content_explosion proc.

This is barely the smallest droplets of water onto a hot stone.

PR replaces the proc with a bitflag in flags_1.
2019-10-26 21:05:25 +13:00
Rob Bailey
c49367f895 More tgui-next uis (#47333)
* More uis

cargo express console

cargo express routes

ui scale change

delete clockwork slab

chem acclimator proper

codex gigas

gigas cleanup

crew console

crew monitor work

scrap crew console for a later pr

lint fixes + rebuild

get rid of some temp files

get rid of more temp files

much better codex gigas

remove unused file

* rebuild

* rebuild
2019-10-25 11:55:40 +02:00