Commit Graph

167 Commits

Author SHA1 Message Date
SkyratBot
edf22edc9b [MIRROR] [READY] decorations loot crate! +3 new fancy carpets! (#1522)
* [READY] decorations loot crate!  +3 new fancy carpets! (#54612)

* base

* fixes

* crate

* Update code/game/turfs/open/floor/fancy_floor.dm

Co-authored-by: Fikou <piotrbryla@ onet.pl>

* adds the crate to the pool.

* the crate is pretty rare, why not let it drop four items?

* Update lootdrop.dm

Newline phone edit

* ungoofed

Co-authored-by: Fikou <piotrbryla@ onet.pl>

* [READY] decorations loot crate!  +3 new fancy carpets!

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
Co-authored-by: Fikou <piotrbryla@ onet.pl>
2020-10-31 06:06:12 +00:00
SkyratBot
28472fa8f3 [MIRROR] Moves screen objects from mob to hud (#1336)
* Moves screen objects from mob to hud (#54400)

This moves screen images from icons/mob to icons/hud
Makes more sense and it is easier to find

* Moves screen objects from mob to hud

* Update radial.dm

Co-authored-by: nicbn <nicolas.nattis@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-10-16 03:37:54 +02:00
SkyratBot
b8d9874c27 [MIRROR] Converts all A && A.B into A?.B (#1292)
* Converts A && A.B into A?.B (#54342)

Implements the ?. operator, replacing code like A && A.B with A?.B

BYOND Ref:
When reading A?.B, it's equivalent to A && A.B except that A is only evaluated once, even if it's a complex expression like a proc call.

* Converts all A && A.B into A?.B

Co-authored-by: ZeWaka <zewakagamer@gmail.com>
2020-10-13 23:19:25 +02:00
SkyratBot
ada67ac929 [MIRROR] Ports soup, snacks, icecream, salads and meat to newfood (#1074)
* Ports soup, snacks, icecream, salads and meat to newfood (#54028)

Ports soup, snacks, icecream, salads and meat to newfood

* Ports soup, snacks, icecream, salads and meat to newfood

* Update true_changeling.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-30 14:37:15 +02:00
SkyratBot
dfb34d55ba [MIRROR] Fixes mapstart and random arcade machines (#1011)
* Fixes mapstart and random arcade machines (#53958)

Randomly generated arcade machines were getting random boards and initing properly, but they weren't re-built as the appropriate subtype.

This oversight has been remedied. A new subtype has been created for random arcade machines which exists purely to pick a random circuit then create a machine from that circuit's build path before returning that it should be qdel'd.

This new subtype has been appropriately regex find-and-replaced into all maps.
* Objectify

* Fixes mapstart and random arcade machines

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-09-27 19:18:44 +02:00
SkyratBot
13b96bfe01 [MIRROR] Rebalances space loot and space exploration (#981)
* Rebalances space loot and space exploration (#53916)

* Rebalances space loot and space exploration

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-09-25 14:34:13 +02:00
SkyratBot
376e8978d3 [MIRROR] Disable some effect systems during init (#978)
* Disable some effect systems during init (#53929)

Instantly spread gib streaks rather than doing so over a delay
Completely skip broken light fixture sparking during init

* Disable some effect systems during init

Co-authored-by: Tad Hardesty <tad@platymuus.com>
2020-09-25 14:27:39 +02:00
SkyratBot
656ee54f39 [MIRROR] Refactors burgers to use components & auto-eating (#569)
* Refactors burgers to use components & auto-eating (#53224)

* Refactors burgers to use components & auto-eating

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-08-30 05:13:44 +02:00
SkyratBot
7bbe8ec530 [MIRROR] [READY] Vatgrowing: Third time's the charm (#508)
* Merge pull request #53020 from Qustinnus/fatgrowing

[READY] Vatgrowing: Third time's the charm

* [READY] Vatgrowing: Third time's the charm

Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
2020-08-25 01:36:10 +02:00
SkyratBot
6f3c2aac34 [MIRROR] Fixes broken circuit board in delta's electronic marketing den (#493)
* Fixes broken circuit board in delta's electronic marketing den (#53149)

* Fixes broken circuit board in delta's electronic marketing den

* synced with modular map

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2020-08-24 23:52:05 +02:00
SkyratBot
2afc8586e6 Add check timer sources debug command (#108)
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-07-28 19:10:17 +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
Timberpoes
4d7f5863f9 Change genetics machine department flags, fix inconsistency (#51670) 2020-06-22 15:48:19 +02:00
nemvar
b87f65d95e Converts ALL typepaths to lowercase (#51642)
* Case of lower

* More changes

* Ruins the nice 420 diff, brainfart when doing the second batch of conversions

* More changes

* Next batch. I think

* Converts even more paths

* Restarts bots

* Capital Free Zone

* Come on travis, do something

* Renames areas

* Bots, please stop dying

* Updates CONTRIBUTING.md and updates a few paths I missed.

* APC recgarftzfvas
/obj/item/computer_hardware/recharger/apc to /obj/item/computer_hardware/recharger/apc_recharger
2020-06-17 20:47:57 -03:00
trollbreeder
111860c9b3 La la la, maphelpers ftagn!
Gibspawners and mob_spawn objects now have icons. There's also unique icons for assistant, cook, engineer, miner, etc. corpses. Also sets the invisibility of delayed mob spawns to 101 so it doesn't show up. Also adds a name for basetype mob spawns.
2020-04-19 20:48:01 +02:00
gregolego
04529469c0 Minor map fixes (#50086)
* Minor map fixes part 1

Donut:
- Gave geneticist medical access on donut
- Geneticist can now use genetics maint and South genetic door
- Replaced genetics door with glass door (for aesthetics)

Meta:
- Fixed cell 3 door/timer being linked to cell 2. Now cell 3 is independent from cell 2.

Bar bluespace shelter:
- Gave mining access to bar area (it's sort of redundant otherwise)

* Minor map fixes part 2

- Added "purge" AI module to risky AI module spawner
- Added "reset" AI module to AI chamber on donut

* Fixed trailing newline
2020-03-21 10:13:00 -03:00
Bawhoppen
d0c5d63116 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 2020-03-02 19:30:48 -06:00
MMMiracles
f739e80649 Double-Decker Donut Disaster (Multi-Z Donutstation) (#48781)
* uhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh

* upper staircases, lots of upper floor work

* railings

* ai sat rework, exterior decals

* ass ass ASS ASS fuckin ASSSSS

* oh my god its full of stairs

* forgot a file oop

* railing fix on multiz test, upper atmos, external space dust deterrents

* both-way rail climbing, maint work, 2nd story atmos desk, pipe/wiring/ allow floating over openspace and moving up-down openspace in nograv, trailing ends

* go NORTHWESSSST

* maint work, hull work, gamer time

* upper security, more maint work, eva catwalks, less retarded railings, hiding signs from openspace, elevators suck, wire/pipe work

* more maint work, decal work on 1st floor, called my parents they appreciated it

* multiz test shit

* maint work, hallway work, botany work

* removed cloning, turned into general treatment, added small temp corpse storage next to treatment

* eduititititit

* gamers

* openspace fixes

* os over os fix

* prison rework, hallway work, pr prep

* mapmerge + remove pixel 0s

* bad area and more railings, newline

* unnecessary vis flags and unused computer console

* public mining dock

* oops lol

Co-authored-by: Dennok <Deneles@yandex.ru>
2020-03-02 03:44:59 +08:00
Bawhoppen
96138784c8 contraband drug list improvement 2020-02-27 21:14:02 -06:00
EOBGames
584cf73c09 metamed1.3
a good round of feedback, guys
2020-02-25 03:57:44 +00:00
Bawhoppen
fcf3ce223c shiv + laundry cart 2020-02-18 04:40:28 -06:00
Bawhoppen
8b2a728291 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
#	code/datums/weather/weather_types/radiation_storm.dm
#	code/game/area/Space_Station_13_areas.dm
2020-02-14 21:28:55 -06:00
Krysonism
eb8b752e58 [READY]Da mafia update. Mob nicknames, new fedoras, suits! (#49029)
* base

* adjust suits

* Beige suit + fedora

* madonna

* fixes bug

* virgin mary

* Improvements

* Linter

* Removes duplicate sprite

* readds my fedora sprites.

* Gets woke(no sleep)

* linter

* readds my missing hats

* Call your parents

* resolves conflict yet again.

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-02-14 13:10:17 -05:00
Bawhoppen
0a0e42b3ac prison 2020-02-07 02:24:50 -06:00
skoglol
a28b24f149 Completely removes cloning (#48668)
* Removed from code

* Removes cloners from maps

* Some more references, now compiles.

* Reduces availability of replica pods

* DNA scanner and tech disk rebranding

* pubby door name, cargo pack description
2020-02-04 16:04:06 -05: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
py01
fef512d851 Maintenance loot table revamp (#47646)
* new maint loot tables

* Loot spawn probability finder

* maint loot pool changes
2019-11-18 18:50:59 -08:00
TheVekter
d080860a8f Removes illegal tech from syndicate thrown weapons (#47820)
* Changes loot table to remove syndicate throwing items from gambling drop table
Removes illegal tech from Mateba revolver.

* Okay fine we'll do it this way

* Something something hugbox
2019-11-17 19:47:40 +01:00
skoglol
9c374bab73 Dice bags spawn the special die in the bag (#47561)
* Makes special die spawn in the bag

* No weighted pick
2019-11-05 01:22:17 -08:00
spookydonut
2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
py01
fb2c1a2796 Lootdrop spawners support nested lists (#47461)
* lootdrop spawners support nested lists

* updates istype to islist
2019-11-01 19:56:30 +11:00
Firecage
b18e8ba52b Makes Plastitanium Windows deconstructable and children of Reinforced Windows. (#46679)
* Makes plastitanium windows children of reinforced windows.

* Unanchored variety isn't fully tooled in now.

* Path moved to plasma/reinforced/plastitanium

* Fixes a blunder about neglecting a mapping path change.
2019-09-25 18:25:48 -07:00
Krysonism
4514a98633 The gambling anticipation update. D6 resprite and more! (#46471)
About The Pull Request

This PR resprites the D6, adds two money bags and a bag of 5 d6'es to the bardrobe. Be on the look out for the expensive ebony dice.

I have also made code improvement by filling dice bags using PopulateContents() and giving the special dice their own loot spawner.
Why It's Good For The Game

I have recently in anticipation for the roulette update tried playing some simple dice games with my bar patrons to great success. I did however notice that the old d6 sprites were quite bad, so i decided it was time for a resprite,

I have also added money bags to the BarDrobe since those will be needed if more forms of gambling are added to prevent greytiders from stealing all your winnings.

DiceComparasion
EbonyDiceLarge
Changelog

cl
add: Money bags can now be obtained from the BarDrobe.
add: A bag of d6'es is now available in the BarDrone. May contain a rare die.
imageadd: New d6 base sprites and variant.
refactor: Improved the way the normal dice bags is populated.
/cl
2019-09-16 16:43:20 +12:00
Rob Bailey
2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
Rob Bailey
6a26744d83 Clothing /under repath (#45548)
About The Pull Request

repaths clothing/under to be more sane
Also fixed a couple of bugs relating to pathing being incorrect, and modified a couple of bad descriptions and names
Also adds a map path updating script, which also helps show the full repath.
Why It's Good For The Game

improves maintainability, makes mapping easier, stages for a clothing dmi split
Changelog

cl
refactor: repathed all under clothing, keep an eye out for errors
/cl
2019-07-30 19:20:21 +12:00
XDTM
95981ea926 Makes the abductor healing gland more interesting (#44903)
* Makes the abductor healing gland more interesting

* Implant rejection

* .

* no vomit for blood regen

* Update code/modules/antagonists/abductor/equipment/glands/heal.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-07-12 02:25:31 -07:00
vuonojenmustaturska
c656547df0 wtf 2019-05-16 00:59:41 +03:00
Farquaar
3dbc8c3c12 Adds a Bunch of New Religious Clothing Items (#43841)
* Adds the rasta beanie

* Added Bishop Mitre

* Added some more religious headgear

Clown Mitre (Hat of the Honkmother)
Kippah
White and Red Taqiyahs
Medieval Jewish Hat

* Fixes icon_state for the Hat of the Honkmother

* Added some new chaplain outfits

Bishop Robe
Monk's Frock (with hood)
Eastern Monk's Robe
White Robe

* Added Robes of the Honkmother

* Added new religion hat icons

Bishop Mitre
Clown Mitre
Kippah
Red and White Taqiyahs
Medieval Jew Hat
Rasta Beanie

* Added new religion suit icons

Bishop Robe
Monk's frock
Eastern Monk's Robe
White robe

* Added new religious suits

* Added new religious headgear

* Added in-hand sprites for new religious suits

* Added new religious clothing to the chaplaindrobe

Includes new premium and contraband objects.

* Added clown priest's robes to premium

* Added some religion follower hats

Kippah
Taqiyah (red)

* Added rastacap to the chaplain vendor

* Fixed obj directory for red taqiyah

* Fixed spelling of "dreadlocks

* Allowed clown robes to hold prank items

* Created .dm for chaplain suits

For easy organization

* Removed clown priest robes

Put them in chaplainsuits.dm

* Moved new chaplain suits

To chaplainsuits.dm

* Moved holiday priest

to chaplainsuits.dm

* Moved holiday priest to chaplainsuits.dm

* Updated suit obj defines, added monk's frock

* Updated obj defines for chaplain suits

* Updated holiday priest obj define

* Updated chaplainsuit obj defines, added white robes

* Fixed subtype define

Man, that was an embarrassing spelling mistake

* Fixed subtype define

For real this time I hope

* Added chaplainsuits.dm

* Fixed clown robes

* Updated holiday priest path

* Updated path for chaplainsuits

* Re-added prank items to clown robe storage

* Updated pathing for chaplain suits on Pubby

* Added comments

Hopefully this will help the AppVeyor check go through
2019-05-10 15:01:45 -04:00
MMMiracles
a5f5aee5a2 [READY]New Map: Donutstation V.5 (GOLD) (Platinum Hits) (#41099)
cl MMMiracles
add: A new(old?) map, Donutstation, is now in rotation.
/cl

Map Image
Comparison Image of Original

Progress

Departmental Layout
Atmos
Wiring
Detailing/fluff

    Floor tiling

A faithful recreation of Donutstation, keeping some landmarks of the old map similar while bringing in all the new content and departments that come with it.
2018-12-16 12:47:27 +13:00
coiax
446641f329 Repath blindfolds to prevent regular sunglasses creation exploit (#41710)
Blindfolds don't actually need to inherit anything from sunglasses, from what I
can see, unless there's some bad type checking somewhere in the code that I'm
not aware of.

Exploit is: cloth makes blindfold + medHUD -> medHUD sunglasses -> remove
medHUD, regular sunglasses.
2018-11-30 14:21:22 -08:00
coiax
b095e02bfd Removes var-edited maint loot spawners, replaces with types (#41696)
These are very common var edits across all maps, and we should replace
them with standardised types.

This leaves room open for giving each loot a little (xN) icon.
2018-11-28 22:31:23 -05:00
Jack Edge
48164dd7e7 Removes some unneeded variable specification with circuitboard spawners 2018-11-24 22:53:35 +00:00
ShizCalev
573b699ddb Fixes bodyparless gibspawners spitting out world messages 2018-11-10 22:53:38 -05:00
ShizCalev
60133f90ab Fixes gibs not being passed mob DNA (#41374)
* Fixes gibs not being passed mob DNA

* Cleanup, fixed map-placed gib spawners having no DNA
2018-11-10 14:24:12 -05:00
81Denton
8d24914fe8 Adds nanite circuit boards to secure storage (#40008) 2018-09-13 10:51:46 +02:00
ShizCalev
600586c72b Fixes var set lists on maps (#39615) 2018-08-09 17:04:25 -04:00
Tad Hardesty
2552190fbf Fix some weird syntax 2018-07-31 01:24:31 -07:00
ShizCalev
c41d6ac965 Standardizes and cleans up some admin messages & logging (#38128)
* Improved logging

* Fixes & emitter logging

* ded
2018-05-30 21:57:06 -07:00
Denton
aa2633f282 lootcount comment 2018-05-10 22:01:00 +02:00
Denton
353af378cb adds circuit board spawners, adds missing electronics to engivend
replaces tech storage circ boards with spawners
2018-05-10 21:50:55 +02:00