Commit Graph

14761 Commits

Author SHA1 Message Date
Rykka Stormheart
8e2fe745d8 Serenity Mech Fix for gygax armor plates. (#6641) 2020-01-23 20:55:16 -08: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
f44d31451e Fix remaining diagnostics 2020-01-18 23:01:36 -08:00
Tad Hardesty
d8a64c83dc Use compatible var statements 2020-01-18 23:01:36 -08:00
Tad Hardesty
6ed5f8de4b Replace () with null where appropriate 2020-01-18 23:01:36 -08:00
Tad Hardesty
644347cfeb Remove stray . and ..() 2020-01-18 23:01:36 -08:00
TheFurryFeline
c3854dc5b4 Light Frame Infinite Steel Fixy (#6633)
* Light Frame Infinite Steel Fixy

Title.

Changelog Notes: 

- Fixes light frames returning 5 steel per deconstruction when 2 steel is used to create the frame.

* Changelog
2020-01-18 21:50:12 -08:00
TheFurryFeline
fb6394b89d Changeling Item Name/Desc Fixy (#6624)
* Changeling Name/Desc Fixy

Minor var fixes for the changeling combat boots variation. Apparently name and desc were flipped around, resulting in abnormal name output when removed from a dead Beta Replicant.

* Changelog
2020-01-15 23:55:23 -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
97bb7e3ff7 Multi-Updoot
Log Doot
RnD Doot
Binder Doot
Supply Doot
2020-01-15 16:59:18 -06: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
Mechoid
daab287c51 GameMaster Tuning (#6593)
* Actually Game Master but I am an idiot.
2020-01-04 22:38:01 -08: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
Atermonera
11a8f3ef82 Merge pull request #6580 from Shadow-Quill/APC-AirAlarm-Alt-Click
APCs/Air Alarms can be (un)locked via altclick
2019-12-21 22:57:59 -08:00
Atermonera
e749b79026 Fixes mech projectile armor thinking test projectiles are dangerous (#6480)
* Fixes mech projectile armor thinking test projectiles are dangerous

* Actually adds some files to polaris.dme
2019-12-21 20:56:24 -08:00
Shadow
c10aade16f The Altening 2019-12-20 23:02:32 -06: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
a8a265382f Merge pull request #6539 from Mechoid/FixBioprinter
Fix the bioprinter
2019-11-29 19:49:23 -05: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