* Add a LOT of chaplain clothes from various religions.
* Thanks, linter!
* Deploy vendors, box envirosuits, unaccent names
* Thanks, linters!
* Accommodate ears.
* Correct accent oversight.
* Merge branch 'master' into chaplain-outfits
Conflicts in
icons/mob/clothing/species/plasmaman/helmet.dmi
icons/obj/clothing/species/plasmaman/hats.dmi
resolved by automatic merge and modifying chaplain helmet sprites to match new format.
* Adds reinforced APCs and frames for them.
* farragus WIP
* more farragus stuff
* more faragus stuff
* more farragus
* uses plastic for insulation instead
* box and faragus changes
* Box changes
* cerebron changes
* more meta updates
* fixes short on box station
* fixes shorts on meta station
* delta changes
* adds reinforced apcs with bigger cells
* emerald things
* more diagoras
* cleaning up cables in diagoras
* switches elecmaints smes to the engineering type on diagoras
* adds more grid monitors to cyberiad
* various corrections
* 2 doors on cyberiad electrical maints
* boxstation fixes
* Kerberos fixes
* cerebron fixes
* some faragus fixes
* more cyberiad fixes
* meta fixes
* more kerberos fixes
* faragus and cyberiad fixes
* emerald fixes
* farragus fixes
* emerald fixes
* farragus fixes
* emerald fixes
* diagoras fix
* more map fixes
* more CI fixes
* final fixes I hope
* Update emeraldstation.dmm
* finish merging metastation
* reset meta to master version
* redoing some of the meta changes
* Update metastation.dmm
* clear merge conflict
* Update metastation.dmm
* Update metastation.dmm
* Update metastation.dmm
* meta resolution
* emerald resolution
* delta resolution
* fartgas resolution
* box box
* stay out stay out
* metastation fixes
* faragus fix
* delta fix
* meta changes
* Starting over with farragus
* Starting over in faragus
* faragus changes
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* resolving some faragus conflicts
* resolve faragus conflicts
* resolves delta conflicts
* resolves cyberiad conflicts
* resolves emerald conflicts
* fixes cables in faragus
* fixes meta cables
* fixes delta cables
* more meta fixes
* more farragus cable fixes
* more cable fixes
* meta and faragus fixes
* box and delta fixes
* more mapping fixes
* hopefully the last fix
* Update metastation.dmm
* Update metastation.dmm
* fixes shorts on cyberiad cerebron and farragus
* CI fixes
* Update cerestation.dmm
* resolve faragus conflicts
* resolve emerald conflict
* fix some faragus cabling
* more cabling correction in faragus
* more cable fixes
* Update cerestation.dmm
* remove doubled scrubber pipe on tile
* resolves faragus conflict
* changes the default power input of engineering SMES to 200kw and 80kW respectively
* connects power monitoring computers to the grid that weren't
* meta station elec maints improvements
* adds missing power monitoring computers on box and delta
* removes dirt from wall
* corrects area boundry on meta
* adds missing cable on box sci
* removes dirt from wall on box
* connects cyberiad bridge to the rest of the powernet
* connects box brig to powernet
* Adds catwalks to box maints
* adds catwalks to meta
* Adds catwalks to delta
* Update deltastation.dmm
* adds ability to insulate cables
* Moves stations to using extra insulated cables for high power network
* Removes catwalks from meta
* Removes catwalks from box
* Removes catwalks from delta
* resolves box conflicts
* Update cable.dm
* remove floating request console
* corrects position of fire alarm and removes extra intercom on metastation
* resolves faragus conflict
* fixes a stray light bulb and light switch in maints as well as a doubled power
* wires kerberos security checkpoint to the grid
* Update cerestation.dmm
* Removes stray extinguisher cabinet from meta station
* resolves area conflict on faragus
* resolves more faragus issues
* fixes faragus cabling issues
* Update cerestation.dmm
* removes another stray fire extinguisher cabinet
* insulates the APC in delta PTL room
* connect delta fore starboard solars to the high power grid instead of the low power
* Update deltastation.dmm
* deconflict
* solves some unconnected cables
* connects delta customs to network and finishes resolving conflicts
* Update deltastation.dmm
* adds the new cables. needs coils and mapping
* moves connection perms to the heavy duty cables. toggled with engineering permission ID. box gets new cables
* sorts cables on stations
* faragus cable connections
* cable corrections. Adds heavy duty cables to the autolathe
* CI fix
* more fixes and makes the new cables show up on t ray scanners
* box station mapping fixes
* delta mapping fixes
* meta fix
* Update deltastation.dmm
* delta and faragus fixes
* Update emeraldstation.dmm
* adds diagonal sprites to heavy duty cables. allows sillicons to toggle them and
* Makes borg versions of the heavy duty cable coil
* palete consolidation
* Improves visibility of high power cables
* fixes a wrong wire under the pet store maints door in delta station
* resolve conflicts
* migrates new cable type to new attack chain
* Update cable_coil.dm
* vkfdnvhy
- Added "Densed Nicotine" reagent, which is similiar to Nicotine, but has lower overdose threshold, is not addictive and also deals minor lung damage, makes people cough, sends evil messages to user
- Added "Carcinoma Angel" cigs which contains "Densed Nicotine". They can be found in hacked or syndie/beach cigarette vendors or in maints as loot.
* Update drugs.dm
* Apply suggestions from code review
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
* cough... new()...
* Update cigs.dm
* Update fancy.dm
* Update drugs.dm
* Update cigarettes.dmi
* Update cigarettes.dmi
* Update cigarettes.dmi
* Revert "Update cigarettes.dmi"
This reverts commit 831790523e.
* Update cigarettes.dmi
---------
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
* all the sprites in the wrong place
* suits are now in the suit files
* code and whatnot
* oops all config
* hand holes, locker, garment bag, loadout
* adds locker to every station
* some fixes
* pleases review overlords
* fixes errors?
* People lying on the ground can no longer be hit by a bola.
* Use the IS_HORIZONTAL macro instead
---------
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
