Commit Graph

4869 Commits

Author SHA1 Message Date
Leshana
b4556a3aee Fix NTNet Relays to be constructible/de-constructible
- Circuit boards should use type paths not strings.
- Use standard default component creation pattern.
- Fix race condition between /datum/ntnet/New and NTNet relay Initialize()
2020-02-12 00:03:27 -05:00
Atermonera
d0159d32f8 Merge pull request #6666 from Heroman3003/synthpair-fix
Applies same restrictions as first aid to external synth repair
2020-02-10 15:53:14 -08:00
Atermonera
27f693670b Merge pull request #6675 from GeneriedJenelle/patch-1
Logs graffiti and crayon drawings: Non-Cursed PR
2020-02-09 20:44:25 -08:00
Atermonera
af1929f74e Merge pull request #6662 from Shadow-Quill/Baton-Intent-Change
Stunbatons will now only harmbaton on grab/harm intents
2020-02-09 11:45:47 -08:00
GeneriedJenelle
196850b5c7 finally makes it a config option
should be ready now.
2020-02-07 00:56:51 +00:00
GeneriedJenelle
f5e86a7f38 Logs graffiti and crayon drawings: Non-Cursed PR
I will try to not do voo-doo somehow this time.
2020-02-07 00:51:18 +00:00
Heroman
bf8cf75785 Applies same restrictions as first aid to external synth repair 2020-02-04 09:17:09 +10:00
PrismaticGynoid
f8ffd25caf Adds some toys to the loadout
Adds a few toys, including action figures, to the loadout. Also fixes water flowers being unrefillable.
2020-02-01 20:16:30 -08:00
Shadow
607268a756 The change 2020-01-31 22:05:22 -06:00
Atermonera
af635d0978 Merge pull request #6640 from TheFurryFeline/patch-5
Aaaa, typo fixy
2020-01-21 15:13:49 -08:00
Atermonera
9684db1fe4 Merge pull request #6636 from SpaceManiac/patch/syntax
Fix various syntactic problems
2020-01-20 22:05:25 -08:00
Atermonera
0dbcdf6e55 Merge pull request #6628 from Ketrai/cakebranch
Adds a mega cooking recipe
2020-01-20 20:14:07 -08:00
Atermonera
5d5e361649 Merge pull request #6621 from Shadow-Quill/Desc-Adds
Moar descriptions for things
2020-01-20 19:48:57 -08:00
TheFurryFeline
b21088bc49 Aaaa, typo fixy
Changelog Notes: 

- Fixes an extra "unleash" in desc.
2020-01-20 13:37:50 -05:00
Tad Hardesty
d8a64c83dc Use compatible var statements 2020-01-18 23:01:36 -08:00
Tad Hardesty
644347cfeb Remove stray . and ..() 2020-01-18 23:01:36 -08:00
Atermonera
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
Atermonera
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-Quill
e0774cceef Web Edit 2020-01-10 12:05:31 -06:00
Atermonera
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
Mechoid
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
Cerebulon
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
Atermonera
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
Atermonera
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
Atermonera
3d0268cc1d Merge pull request #6567 from Mechoid/FixCircuitToCommunicatorMessages
EPv2 x Communicator fix.
2019-12-15 11:52:53 -08:00
Atermonera
58d334ec0f Merge pull request #6566 from Mechoid/MultitoolFix
Fix Multitool Modes
2019-12-15 11:51:47 -08:00
Atermonera
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
Novacat
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
PrismaticGynoid
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
lolman360
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
Anewbe
f224d01661 Merge pull request #6547 from TheFurryFeline/TFF-Lamps_Lights_Lackluster
Lamps, Lights, Lackluster!
2019-11-29 19:49:01 -05:00
Anewbe
450132b3ed Merge pull request #6550 from listerla/grammar-time
Fixes two typos (rengeration and Extranneous)
2019-11-29 19:48:30 -05:00
Anewbe
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