Commit Graph

18004 Commits

Author SHA1 Message Date
elgeonmb
36982f775a Sabess wanted me to add these tattoos so I did 2018-07-07 02:44:17 -07:00
Verkister
3b3a4ae19f Adds an option to enable/disable markings on synth parts.
-In char setup near the synth color option.
-Tested working although the preview icon may misbehave with the icon cache. (Meaning the effect will require refreshing the cached icon with a visual change, such as color, markings, limb status change, etc. to show up, and may not show up at all if the appearance is identical to an earlier one already saved to cache and getting loaded from there instead of refreshing.)
2018-07-07 10:46:18 +03:00
Anewbe
7db95d4caf Merge pull request #5391 from VOREStation/pol-infra
Tweak i_beam qdel logic
2018-07-06 18:34:25 -05:00
avabee
b4e1d3f6fb Fixes a typo with cups of lime tea.
It would erroneously say "berry tea". This fixes that.
2018-07-05 17:27:27 -05:00
Arokha Sieyes
4f8e4fbbd8 Tweak i_beam qdel logic
Seems sketchy!
2018-07-05 15:04:51 -04:00
Anewbe
eb690c0f00 Merge pull request #5389 from VOREStation/pol-hypo
Fix hypospray exploit
2018-07-04 10:50:28 -05:00
Neerti
6d2d3dda87 Tweaks carp speed 2018-07-04 10:54:38 -04:00
Arokha Sieyes
a150728e08 Fix hypospray exploit 2018-07-03 18:05:41 -04:00
Anewbe
2a696dbbff Merge pull request #5385 from Mechoid/Camerafix
Fix handheld Cameras
2018-07-03 00:22:06 -05:00
Anewbe
808765ff80 Merge pull request #5375 from Mewchild/MC-Cloaks
Adds non-head of staff department cloaks
2018-07-02 19:31:44 -05:00
Mechoid
894daa8727 Fix cameras not functioning, steal https://github.com/VOREStation/VOREStation/pull/3672/files 2018-07-01 19:24:25 -07:00
Anewbe
1bfbad5e1c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into make_ai_great_again 2018-07-01 20:11:32 -05:00
Atermonera
74cb7f8f4a Merge pull request #5379 from Anewbe/drowsy
Fixes an infinite drowsyness bug
2018-07-01 14:56:31 -07:00
Neerti
45d5e4840b Ports carp to new AI system, adds new mob class type for holocarp. 2018-07-01 10:37:27 -04:00
Atermonera
5064bb2f23 Merge pull request #5377 from Anewbe/taj_sign_tweaks
Renames Taj Sign Language
2018-06-30 15:45:40 -07:00
Anewbe
6bf2724ceb Fixes an infinite drowsyness bug 2018-06-29 17:43:11 -05:00
Anewbe
f6fbe81598 Renames Taj Sign Language 2018-06-29 15:05:13 -05:00
Layne
e7c93ebc94 Only slimes may squish. (#5369)
* Clandestine (Original Commit)

* Revert "Clandestine (Original Commit)"

This reverts commit cdb1abb47b.

* Squish on my slime

* Squish on my slime
2018-06-29 14:55:13 -05:00
Anewbe
9b54e62a89 Merge pull request #5361 from Novacat/spriteadd
Ports Siik'Tajr from Baystation
2018-06-29 14:49:16 -05:00
Mewchild
a8600832d8 Adds non-head of staff department cloaks 2018-06-27 10:24:31 -05:00
Mechoid
0555c99872 Commwatches aren't rings. Please donut deloot. 2018-06-24 19:32:53 -07:00
Anewbe
dd1a5b9ec4 Brings the make_ai_great_again branch up to date with master (#5364)
* Planet controller startup delay

* Fix the New() on this interfering with my work!

* Creates SSplanets subsystem

For SPEEDYNESS

It probably works. I mean it's hard to sit there for 8 hours and test it. But it seems to work okay. At worst if it doesn't you'll have weather that doesn't make sense. ;v

* Recharger refactor

* Reworks weather to fit the faster weather ticker

* Allows AIs to produce and control maint/construction/mining drones. (#5282)

* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.

* Folders props, and adds the laser prism, receptor, and sealed doors. (#5337)

* Re-bases props, and adds the laser prism.

* Ver 1 of Puzzle Lock and Doors

* Doors

* Fix door hiccup I made, modify Prism

* Use SSoverlays please

You have invoked my wrath by not doing this properly!

* Backports turret faction code

* Adds arcing projectiles

* Adds aura style modifier code

* Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter (#5355)

* Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter

* Changelog

* Corrects liver cost oversight

* More Phase Guns (#5276)

* Adds new Phase weapons

* Fixes a thing

* Puts phase weapons in cargo

* Moves research designs, adds phase weapons

* Comments out a duplicate design

* Corrects duplicate design ID

* Last commit on this PR, I swear
2018-06-22 11:53:33 -07:00
Cameron653
2e987ab900 Alien Cable Coil Fix (#5365)
* Prevents the infinite cable coil alien tool from making more infinite cable coil tools.

* Prevents you from going over the 30 cap.

* Tochat
2018-06-21 00:26:02 -07:00
Anewbe
71fe7798f6 Ports Fulton Balloons (#5354) 2018-06-21 00:20:11 -07:00
Anewbe
2d94e00267 Clones merc simple_animal mobs into the simple_mob format (#5363)
* Planet controller startup delay

* Fix the New() on this interfering with my work!

* Creates SSplanets subsystem

For SPEEDYNESS

It probably works. I mean it's hard to sit there for 8 hours and test it. But it seems to work okay. At worst if it doesn't you'll have weather that doesn't make sense. ;v

* Reworks weather to fit the faster weather ticker

* Allows AIs to produce and control maint/construction/mining drones. (#5282)

* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.

* Folders props, and adds the laser prism, receptor, and sealed doors. (#5337)

* Re-bases props, and adds the laser prism.

* Ver 1 of Puzzle Lock and Doors

* Doors

* Fix door hiccup I made, modify Prism

* Converts merc simple_animal to simple_mob
2018-06-21 00:19:29 -07:00
Mechoid
ff827ce831 Fix AI-drone runtimes. Get angry at commits. (#5366)
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.

* Fix some AI-drone runtimes.
2018-06-21 00:18:41 -07:00
Atermonera
04d5f9e522 Merge pull request #5359 from Anewbe/arc_projectiles
Adds arcing projectiles
2018-06-17 12:58:41 -07:00
Atermonera
42b624a9ea Merge pull request #5360 from Anewbe/aura_modifier
Adds aura style modifier code
2018-06-17 12:58:27 -07:00
Anewbe
86901354fc More Phase Guns (#5276)
* Adds new Phase weapons

* Fixes a thing

* Puts phase weapons in cargo

* Moves research designs, adds phase weapons

* Comments out a duplicate design

* Corrects duplicate design ID

* Last commit on this PR, I swear
2018-06-17 10:35:03 -07:00
Unknown
cfe3a7223d Ports Siik'Tajr from Baystation
Tail sign language! I was told Polaris might want this?
2018-06-16 22:58:31 -04:00
Atermonera
32557da8f2 Merge pull request #5356 from Anewbe/recharger_refactor
Recharger refactor
2018-06-16 14:15:15 -07:00
Anewbe
109a93b2ac Merge pull request #5357 from VOREStation/pol-overlays
Use SSoverlays please
2018-06-16 12:42:16 -05:00
Anewbe
c72807f458 Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter (#5355)
* Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter

* Changelog

* Corrects liver cost oversight
2018-06-16 10:41:20 -07:00
Anewbe
53b8a58c76 Adds aura style modifier code 2018-06-16 12:35:40 -05:00
Anewbe
6b8746956a Adds arcing projectiles 2018-06-16 11:37:41 -05:00
Atermonera
96ea710353 Merge pull request #5350 from Anewbe/weather_nerfs
Weather is shorter, hail is less deadly.
2018-06-16 00:27:37 -07:00
Arokha Sieyes
4fb04110d5 Use SSoverlays please
You have invoked my wrath by not doing this properly!
2018-06-15 21:51:21 -04:00
Mechoid
4cd51ff79f Allows AIs to produce and control maint/construction/mining drones. (#5282)
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.
2018-06-15 19:14:16 -05:00
Anewbe
1c0867d95f Reworks weather to fit the faster weather ticker 2018-06-15 18:47:19 -05:00
Anewbe
9e28740697 Merge pull request #5322 from VOREStation/pol-planetstart
Move planets to SSplanets
2018-06-15 18:05:25 -05:00
Neerti
b22f44d560 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again
# Conflicts resolved:
#	icons/mob/modifier_effects.dmi
2018-06-15 18:28:00 -04:00
Neerti
8fdfb1bc53 Pre master pull commit 2018-06-15 18:15:24 -04:00
Anewbe
91edca4434 Recharger refactor 2018-06-14 15:37:22 -05:00
Anewbe
8b6377016f Merge pull request #5349 from Woodratt/WR6112018_clothingfix
Clothing Bug Fixes
2018-06-14 09:53:19 -05:00
Anewbe
88555dc5f0 Merge pull request #5351 from MagmaRam/coffee
Fixes "glass of cup of coffee"
2018-06-13 21:47:40 -05:00
MagmaRam
52367a96c2 Adds a "cancel" option to the Drop-Bomb admin verb. 2018-06-12 22:28:36 -05:00
MagmaRam
9c5492fd00 glass of cup of coffee begone 2018-06-12 21:51:10 -05:00
Atermonera
e8020dec9d Merge pull request #5335 from Anewbe/hair_stealing
Ports some Bay hair code
2018-06-12 00:43:43 -07:00
Woodratt
344cb191a5 Clothing Bug Fixes
- Fix for duster on mob sprite
- Fix for striped swimsuit the on mob sprite
- Fix for hairpin on mob sprites
- Moved Riot and EMT spacesuit sprites to the proper dmi
- Moved combat rig sprite to the proper dmi
- Added a new gasmask (ported from Vorestation). Gasmask with a clear faceplate. Not added anywhere in the playing field
- Radiation hood now will not have hair clip through
2018-06-11 15:22:13 -07:00
Layne
b4c1722bd6 Sky is not a 'skiy' (#5344)
* Clandestine (Original Commit)

* Revert "Clandestine (Original Commit)"

This reverts commit cdb1abb47b.

* the skiy
2018-06-11 13:10:40 -05:00