Commit Graph
4605 Commits
Author SHA1 Message Date
AtermoneraandGitHub 0dbcdf6e55 Merge pull request #6628 from Ketrai/cakebranch
Adds a mega cooking recipe
2020-01-20 20:14:07 -08:00
AtermoneraandGitHub 5d5e361649 Merge pull request #6621 from Shadow-Quill/Desc-Adds
Moar descriptions for things
2020-01-20 19:48:57 -08:00
AtermoneraandGitHub 4284dd784c Merge pull request #6619 from Shadow-Quill/Chem-Master-Building
Can now (de)construct chem masters
2020-01-15 20:15:33 -08:00
AtermoneraandGitHub 4b726189cc Merge pull request #6612 from Shadow-Quill/PDA-Ctrl-Click
Ctrl+Click now removes pens from PDAs
2020-01-15 20:06:40 -08:00
Shadow eb3b297913 Components! 2020-01-15 16:58:35 -06:00
ketraiski 31cd94617b Adds a chaos cake 2020-01-15 14:02:10 +01:00
Shadow 46d7ca5d31 Round Two 2020-01-11 11:53:07 -06:00
Shadow 6088899908 Round One 2020-01-11 02:25:38 -06:00
Shadow e018d59641 Ding! 2020-01-10 23:04:54 -06:00
Shadow-QuillandGitHub e0774cceef Web Edit 2020-01-10 12:05:31 -06:00
AtermoneraandGitHub c100cca81a Merge pull request #6606 from Heroman3003/kernel-im-dummy-thick-and-clamp-of-my-code-breaks-breathing
Fixes clamp being used with wrong syntax in places
2020-01-09 22:09:05 -08:00
Shadow 2ab0bbe468 Adds the CTRL+Click to get pens out 2020-01-09 16:48:11 -06:00
MechoidandAtermonera d9076dbaff Xenoflora expansion take2 (#6592)
Xenoflora
2020-01-08 10:44:41 -08:00
Heroman 01c853526b Fixes clamp being used with wrong syntax in places 2020-01-06 08:32:08 +10:00
Heroman 5ef1a972c9 Fixes AI not being able to escape out of energy nets 2019-12-29 08:36:19 +10:00
CerebulonandAtermonera f3e3703aae Coffee Shop Revamp (#6559)
* Adds bagels and decaf coffee

* Remaps the coffee shop to be a bit more appealing to visit.

* Map merge fuckery.

* Map merge fuckery. also changelog.

* took out blank line just in case

* why did the dmi do that

* revert unintended revert
2019-12-22 19:53:11 -08:00
TheFurryFeline 3474870177 Light Replacer QOL
Tweaks light replacers to allow automatic replacing of broken bulbs in a light fixture. Also lets you shove bulbs into said objects. Ported from Yogastation with code used from https://github.com/CHOMPstation/CHOMPstation/pull/517. If there's a better way to code this, do tell me. It works, however.

Changelog notes:

- Light replacer now uses broken lights instead of dropping them
- Every 4 broken lights switched refills the light replacer with 1 new bulb
- You can now also use a box of lights on the light replacer to refill it (the old method of using the light replacer on the box still works)
2019-12-16 10:34:54 -05:00
AtermoneraandGitHub f14184f105 Merge pull request #6558 from Mechoid/GlobSpecies
Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-15 21:51:05 -08:00
AtermoneraandGitHub 7b9bc5b291 Merge pull request #6520 from Meghan-Rossi/idcleanup
Clean up dead code obsoleted by outfit system
2019-12-15 21:50:33 -08:00
Mechoid f37b9e592b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into GlobSpecies
# Fix Conflicts:
#	code/modules/mob/living/simple_animal/animals/spiderbot.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	polaris.dme
2019-12-15 12:02:02 -08:00
AtermoneraandGitHub 3d0268cc1d Merge pull request #6567 from Mechoid/FixCircuitToCommunicatorMessages
EPv2 x Communicator fix.
2019-12-15 11:52:53 -08:00
AtermoneraandGitHub 58d334ec0f Merge pull request #6566 from Mechoid/MultitoolFix
Fix Multitool Modes
2019-12-15 11:51:47 -08:00
AtermoneraandGitHub af301e7b73 Merge pull request #6563 from Novacat/nova-accessory
513 Compatability
2019-12-15 11:47:42 -08:00
Mechoid a65fb58a5a EPv2 circuits can now properly send 'text' data type messages to communicators, and initiate 'conversations'. 2019-12-14 02:08:14 -08:00
NovacatandMechoid 45aa4ba3de More bug fixes (#6560)
* More esword fixes

- Fixes Holodeck eswords being completely broken, Holodeck eswords are not recolorable
- Fixes Toy sword onmob sprite not properly updating
- Fixes eswords not properly updating onmob color (this is an incredibly hacky fix)
- Readds the esword sub types, they are not recolorable

* Removes unintended code

* More unintended code removal

* Fixes spy bug sprite

* Fixes PMC-S Name

* Fixes syringes not working through voidsuits.
2019-12-13 17:55:47 -08:00
Mechoid c70a0eefb7 So apparently, I'm still an idiot. 2019-12-13 16:23:30 -08:00
PrismaticGynoidandMechoid f24bd85d89 Graffiti selection (#6562)
* Lets you choose what type of graffiti or rune to draw when vandalizing the floor with crayons or markers. No more drawing and erasing a dozen times to get the exact graffiti you want.

* Puts in Mechoid's suggestion
2019-12-13 14:00:59 -08:00
Unknown fbbf91b799 Updates travis, replaces lentext 2019-12-12 13:29:43 -05:00
Mechoid b687d7da7e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into GlobSpecies 2019-12-05 23:55:44 -08:00
Mechoid 58e2ce2fb4 Change various global species lists to GLOB versions. 2019-12-05 23:55:22 -08:00
lolman360andMechoid 31d5dc9e39 Fixy-wixies the fucky-wucky I madey-wadey with toy swords. (#6526)
* one

* rtwo

* image

* Update material_weapons.dm

* Update toys.dm

* Revert "Update material_weapons.dm"

This reverts commit 1a37bb015a.

* Revert "image"

This reverts commit 6496dd404d.

* Revert "rtwo"

This reverts commit 3b7aacd6c8.

* Revert "one"

This reverts commit 324d188058.

* Update toys.dm
2019-12-05 15:27:33 -08:00
AnewbeandGitHub f224d01661 Merge pull request #6547 from TheFurryFeline/TFF-Lamps_Lights_Lackluster
Lamps, Lights, Lackluster!
2019-11-29 19:49:01 -05:00
AnewbeandGitHub 450132b3ed Merge pull request #6550 from listerla/grammar-time
Fixes two typos (rengeration and Extranneous)
2019-11-29 19:48:30 -05:00
AnewbeandGitHub 86168e8640 Merge pull request #6536 from Nalarac/Capset
Captain and HoP Headsets Fully Enabled by Default
2019-11-28 14:14:05 -05:00
lacune 701509605b Fixes two typoes (rengeration and Extranneous) 2019-11-27 18:03:02 -05:00
TheFurryFeline aac50da208 Lamps, Lights, Lackluster!
Since the refactor https://github.com/PolarisSS13/Polaris/pull/6196 seems to have changed how desk lamps can light a room up, time to fix what happened for said desk lamps.

Changelog notes:

- Tweaks desk lamps for more light output.
2019-11-27 09:56:23 -05:00
Andrew f247264b6d Captain and HoP Headsets Enabled by Default
Changes the Colony Director's headset so that the Science, Medical, Supply, Service, and Explorer channels are enabled instead of disabled by default.

Changes the Head of Personnel's headset so that the Security and Explorer channels are enabled instead of disabled by default.
2019-11-25 16:29:58 -06:00
MechoidandAnewbe 7ecdcb40d2 Security / PseudoCargo Expansion (#6482)
* Security Expansion work.

* Weaponized Racism, Stowaways, Meteors

* Fix Fix. Prep modular armor for addition.

* Fix the boots.

* More modular armor work. Now in cargo!

* Fixfix

* Fixfix

* Thank you anxiety very cool.

* Make a Stowaway Antag

* FixFix
2019-11-24 17:22:25 -05:00
TheFurryFeline 2f02c43de5 Mouse Plushie Sprite Change
Title, changes old dead lookalike to a cuter one that's a brown mouse on rest. Just a personal prefernce for this, really. Ported from https://github.com/CHOMPstation/CHOMPstation/pull/824
Old icon_state renamed to mouseplushie-old.
2019-11-12 08:53:55 -05:00
Meghan-Rossi c8fd01a4f5 Clean up dead code obsoleted by outfit system
- job_access_type on ids is used literally nowhere.  Removed.
- spawnId is only called on people who already have ids, and does nothing because of it.  Removed.
- idtype is defined both for jobs and outfits, and for jobs it's only used in spawnid and to not give ais and cyborgs headsets.  Replaced with new has_headset variable
- equip_backpack and equip_survival on jobs are also useless, since outfits handle that.  Removed.
- spawnId put access on ids, but equip_id doesn't.  Made equip_id for job outfits put access on ids.
- With equip_id putting access on ids we don't need all the different subtypes of id.  Removed a lot of them.
2019-11-08 20:26:37 +00:00
lolman360andAtermonera 18c8ed589b Sharpening kits. (#6501)
* one

* rtwo

* image

* Update material_weapons.dm
2019-11-04 17:43:49 -09:00
lolman360andAtermonera 6853419c57 [READY] Recolourable energy weapons. (#6507) 2019-11-01 08:37:27 -08:00
KasparoVy a75c92c03f Loadout Implants Properly go in Mob, not on Floor
The main cause is the 'exploitable' check from `code/game/jobs/job_controller.dm` because the proc `amend_exploitable` from `code/modules/mob/mob.dm` spawns a duplicate of the implant at the mob's feet.

Tertiary issues were...
- The `implant_loadout` proc in `code/game/objects/items/weapons/implants/implant.dm` not inserting the implant in the correct location (was passing an organ instead of a zone define like BP_HEAD, which has a string value of "head".)
- There were unnecessary post-spawn behaviours for dud and neural fluff implants.

What now happens:
- The exploitable check now occurs in the `spawn_item` proc from `code/modules/client/preference_setup/loadout/loadout.dm`.
- The loadout implants are now inserted into the correct locations within a mob.
- There won't be implants created on the floor anymore.
2019-10-27 22:43:27 -04:00
CerebulonandMechoid d47130bf3c ERT Rangers Costumes (#6493)
* Sprites

* and code fuckit
2019-10-25 12:06:18 -07:00
AtermoneraandGitHub d0330d7302 Merge pull request #6487 from Novacat/nova-accessory
Adds Teshari Plush
2019-10-23 15:18:37 -08:00
AtermoneraandGitHub a422d8bea6 Merge pull request #6486 from Novacat/nova-runtimes
Cleans up radio code
2019-10-23 15:18:17 -08:00
Unknown 1a39adb054 Reverts nonfunctional code 2019-10-21 23:39:03 -04:00
Unknown fcfe8f8645 Adds Teshari Plush
Mirror of https://github.com/VOREStation/VOREStation/pull/6085
2019-10-21 20:11:05 -04:00
Unknown 9b73fa8347 Cleans up radio code
Mostly just updates it to baystation standard when relevant. Fixes a few bugs with adhoc_fallback in the process.

I still want to fix the bug where adhoc_fallback fails to work in regions without telecoms.
2019-10-20 18:41:35 -04:00
AtermoneraandMechoid dba1abbcc8 Shards only do damage if you hit things with them (#6478) 2019-10-20 14:54:30 -07:00