Commit Graph

56 Commits

Author SHA1 Message Date
Contrabang ee6f73973e Fixes problems with multiple sources of alpha on humans (#25884)
* lets gooooo

* this too

* comments

* update code

* im so good

* tested, it works now

* Update code/game/dna/mutations/mutation_powers.dm

Co-authored-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
2024-09-26 18:06:44 +00:00
Kyani 32719e2f99 Adds map: EmeraldStation (NSS Diagoras) (#26438)
* fleshed out engi and asteroid

* command work

* more department fleshing out: sec

* sec work

* perma work

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* med and dorms fleshing out

* sci and service fleshing out

* Update EmeraldStation.dmm

* APCs done + detailing

* Update EmeraldStation.dmm

* wire work

* more wire work

* wires and LIGHTS

* ATMOS DONE now onto DECOR

* AI/status monitors

* intercoms and newscasters

* Wall items and cameras!

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* moved the file to the correct area

* bugfixes, starting up the map

* refining the asteroid

* merge fixes

* logs of bugstomping

* more bugfixing

* bugfixing

* bugfixin

* trying to make the stupid lava work

* adds plasma vent for test

* more testing

* swapped file places

* vents work now!

* Update paradise.dme

* vent sprite update

* file corrections

* Asteroid MILLA changes

* adds a new MILLA atmos  type

* Build MILLA

* oopsie

* fixes

* removed testing code

* reverts map start

* reverts the atmos change

* respriting geyser

* comments

* Update code/__DEFINES/atmospherics_defines.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update geyser.dmi

* Update paradise.dme

* fixing past merges

* adds some missing items from merges

* reverting

* reverts changes again

* deleted unused file

* oops forgot nearspace areas

* Update code/game/objects/structures/plasma_geyser.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/turfs/simulated/floor/lava.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/area/ss13_areas/engineering_areas.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/objects/structures/plasma_geyser.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/turfs/simulated/floor/lava.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/objects/structures/plasma_geyser.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Lots of map fixes

* Update EmeraldStation.dmm

* trying to unfuck the milla merge

* removed station from dme

* fixes/small tweaks/suggested changes

* removed errant turret

* redid telecomms

* Update EmeraldStation.dmm

* rebuilding everything

* redoing security

* more sec work

* perma shaped up + more items

* renamed properly this time

* resetting atmos code

* more secwork and move papers off varedits

* more secwork + dorms + funeral services

* added new areas + pipe/wires/floors

* security electrified windows/wires/alarms/lights

* cameras, dorms pipes/ires/alarms/apcs

* merged

* disposals

* lots of wall things + added map datum for testing

* pipe fix for linter

* fiddled with maints

* minor maint edits

* fixes + maint work

* more bugfix

* even more bugfixing

* MORE nearspace fixing

* dumb nearspace fix

* Update code/game/objects/structures/plasma_geyser.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* a LOT of fixes + door access

* disposal pipe update  script

* oops linter fixes

* fixed viro button runtime

* finished maints + space decor

* removed hall light switches

* fixed solars areas

* removed errant lattice

* remove agent B from asteroid

* wall bump placement refining

* apc fix

* bugfixing

* minor maint change

* bugfixing

* burn tile on node fix

* changed official name

* bugfixing

* added genetics locker+figures

* bug hunting (buttons mostly)

* added firelocks. oops

* added temp webmap + bugfix

* Update emeraldstation.dmm

* new webmap. again

* added the perma tools

* nanomaps

* bug fixes, fixes, and more fixes

* more tweaks

* cable fix

* more bugfixing

* Update emeraldstation.dmm

* tiny fix

* fix AI sat turrets

* more bugfixing

* MORE bugfixing

* bugfix + ruins soundfile

* pipe bugfix

* fixed toxins pipes. junctions bad?

* swimwear :)

* remove errant QM gps

* rnd shutter button missing

* potato layering fix

* add bridge request console

* fix window tint in interrogation

* added some clothes

* nanomaps2, asset boogaloo

* modified an empty hall, added some perma cams, minor fixed

* forgot to save before push oops

* widens sci maint hall + bugfix

* gives theatre its autodrobe back!

* moved borg spawns

* moves nuke op default spot

* new asteroid mix + botany tweak

* adds cremator button

* new sign + moved pod + bugfixing

* cable fix

* engine, sci chem, and surgery tweaks

* more bugfixes and tweaks

* more tweaks

* adds a few windows back to robotics

* bar was missing pun pun!

* corrected misplaced atmos machines

* re-added the bathroom

* fixes atmos waste disposal injector

* modified mr potato

* changed bathroom area

* minor toxins tweak

* small wall decor tweaks

* removes errant lights

* removes errant opier

* LOTS of fixes/tweaks + adds CO2 to asteroid

* gave maint some boxes + cable fix

* duped brig lock

* adds masks to medbay storage

* adds missing gues passes

* cleanup from kitchen rework

* gives solars enough glass to complete it

* adds another defib to cryo pods

* makes asteroid sign fireproof

* perma maint now opens with virus + bugfixs

* bugfixing + adds missing holopads

* more holopads + bugfix

* adds some smoke vendors

* kitchen area tweak

* fixed errant rack

* rearranged/spread out cig vendors

* moved a cig machine again

* added RD tint button

* undid a brig area change

* removed errant posters

* added filing cabinets + bugfix

* maint morgue tray fix

* adjusted chapel + bugfix

* fixed palms + minor sec floor tweak

* adds forgotten magi and clown starts

* gave engi a shower

* reworked robotics + atmos bugfix

* geysers now work at 1/10 capacity when overpressure

* bugfixing + tweaked overrides/variables

* rework warden office

* bugfixes + adds some holopads

* added missing bio shutter

* more small tweaks

* adds RnD rework + gives mag some things

* fixed fabricators

* tweaked robo + added rnd server board

* added rnd backup circuit

* bugfixing

* bugfixing again

* bugfixing

* fabricator fix

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-09-13 18:18:25 +00:00
DGamerL b497e4c925 Removes a lot of redefined procs (#26186)
* aaaaaaaaaaaaaaa

* Forgor

* Adds missing /proc/

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-07-30 13:19:32 +00:00
dj-34 7a0d4bb089 Fix ppflowers (flora) generate missing icon (#25553) 2024-05-23 00:20:58 +00:00
Contrabang 34ba019704 Adds more descriptions to missing items and changes some (#24584)
* jesus fuck thats a lot of descs

* Apply suggestions from code review

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* review

* christa review

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>

---------

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
2024-04-07 09:44:27 +00:00
Aylong 4e76e777d9 Randomless Kirby plants (#23376)
* Kirby randomless

* Whoops

* Whoops x2

* Maps Script & missing plant

* Spellcheck

* Plant eye fix

* Update code/game/objects/structures/flora.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* double pipe fix

* errant sign removal

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-01-14 13:22:18 +00:00
Luc 327add6348 Converts two-handedness/wielding to a component (#21619)
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-01 22:06:59 +01:00
S34N 980fee9b60 [s] Fixes an issue with potted plants (#21529)
* fixes this

* tweaks
2023-07-01 12:12:29 +02:00
S34N 04377481a2 Holding a plant pot hides mob HUD (#20868)
* hide plant pot

* different method

* GC

* what am I even doing
2023-05-14 00:23:44 +02:00
Henri215 dc75a748f1 Fixing common spelling mistakes part 3 (#20870)
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
2023-04-22 09:44:27 +02:00
S34N 8e475415b1 Stops tree shadows from being part of their hitbox (#19543)
* unclickable shadows

* readability

* effect

* Update code/game/objects/structures/flora.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* order of operations

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-03 18:02:08 +00:00
S34N ce7d68fcf1 Fixes draggable bushes, sprite oversight [MAPPING CHANGES] (#19351)
* no drag the bush, and other tweaks

* im smart

* mapping changes

* delete
2022-10-19 16:22:41 -05:00
S34N db11313caa Fixes draggable bushes, sprite oversight (#19349)
* no drag the bush, and other tweaks

* im smart
2022-10-12 20:21:39 +02:00
S34N ba802a199a Makes large jungle bushes use the tree transparency system (#18953)
* large jungle bush transparency

* size
2022-09-07 13:38:18 +01:00
SteelSlayer 358ff86ddb Removes the need for ComponentInitialize (#18833)
* removes `ComponentInitialize`

* mapload

* add back CRASH
2022-08-18 22:00:19 +01:00
S34N 07265abdf2 Makes trees transparent if important objects are hiding behind them (#18627)
* tree!

* Update code/modules/admin/verbs/freeze.dm

* yeet

* steel review, animate transparency

* more critical items

* charlie review

* charlie
2022-07-31 23:24:12 +01:00
KalevTait 8dcf49855b Code Readability - Structures (#18273)
* structures

* requested changes
2022-07-10 14:00:25 +01:00
S34N 03beb422b2 Remaps CC, changes z1 layout (#17425) 2022-03-14 20:08:07 +01:00
S34NW 7a8da30830 grass time 2021-10-10 15:20:13 +01:00
Gatchapod 2ef3e3a07c Fixes one-handed plant-people (#15532)
* Removes one-handed plant-people

* Unbreaking things

* Going too fast for my own good

* Alright, this time I actually checked all

* Let's just remove all unrelated changes

* mochi's suggestions

Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
2021-03-28 12:42:50 +01:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
AffectedArc07 43ee2488c7 More New() -> Initialize() for /obj/structure (#15158)
* More New() -> Initialize() for /obj/structure

* Updates these

* Tweaks + Fixes
2020-12-29 10:42:39 -05:00
Darkmight9 30de304fdc Makes grass, flowers, and bushes easily destroyable (#14926) 2020-11-22 21:36:37 +00:00
AffectedArc07 2c37ae8fd0 The road to Initialize() stability - Enforcing parent call on New(), Initialize() and Destroy() (#14719)
* The road to Initialize() stability

* Fixes sanity, for now
2020-10-28 12:35:36 -04:00
AffectedArc07 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
datlo 28caad13f9 add winter/clown biodomes 2019-08-18 21:06:58 +02:00
variableundefined 376cdc709a Merge pull request #9818 from farie82/twohanded-fix
Fixes the giving of required two handed items and chainsaw stuf
2018-10-12 13:24:19 +08:00
joep van der velden c96adec91f Fixed it 2018-10-11 22:55:10 +02:00
Desolate c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Sam 07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Markolie 6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
Markolie e5c4b78f47 Add Colossus, add outdoors variable to areas and update fireball targeting 2016-10-25 04:10:52 +02:00
monster860 19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
Fox-McCloud bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Aurorablade b93fef2369 snek? snek?! SNEEEKEKKKKKK!!!!! (#4759)
* snek? snek?! SNEEEKEKKKKKK!!!!!

* PLANT ops
2016-06-24 11:30:54 -04:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Fox-McCloud 1796bcbc23 nukes jungle module 2015-12-21 22:32:54 -05:00
Certh d665bb0729 Fixes mistakes with using /improper instead of \improper 2015-12-08 10:37:42 +01:00
Certh 591daf04d2 Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).
Also corrected some periods, spelling errors etc. along the way.

If this PR seems familiar, a part of this is of an earlier PR that I messed up.
2015-12-07 16:14:26 +01:00
Fox-McCloud f43e21698c Updates 2015-11-18 23:17:31 -05:00
Fox-McCloud 3ce2c790e8 Adds Additional Plant Sprites 2015-11-08 07:58:37 -05:00
Fox-McCloud 428dde8047 Potted Plant Hiding 2015-05-10 14:41:06 -04:00
Remie Richards 0f7b09ef07 Procedural Map Generator System
This commit adds a Procedural map generating system for code and admins to
use ingame. The system is modular, which means that it is fairly easy to
make new generating systems. Currently, only the 'nature' unsimulated
system is implemented, as a testing verb for admins to use. Admins can
define the starting XYZ and ending XYZ of the generated system.

Players - This means you may see content that is truely random, in the
future.

Coders - This system allows you to randomize map elements. Writing new
modules is documented at
code/modules/procedural-mapping/mapGeneratorReadme.dm
Detailed information about how the system works, and how it can be
integrated is also avalible there.

Admins - This system will allow you to, at the touch of a button, create
very complex structures and turfs that would otherwise require being
spawned in manually, one by one. The nature button is a fairly good
example of this, with it's randomized grass textures, randomly placed
trees, and randomly placed rocks. This would normally take a good 5
minutes to do, spawning the trees and rocks and turfs, but it takes about
20 seconds to enter the coordinates and have it be completely random.
2015-04-11 05:28:10 -07:00
ZomgPonies 8b9583b786 New plant decorations 2013-11-02 00:33:09 -04:00
Segrain c2712dd9d3 Fix for #3410. 2013-08-01 20:58:35 +03:00
aussprites 6251ff6ea2 fixing typo with path.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5300 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-12 16:24:18 +00:00