cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-18 06:01:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,274 Commits 5 Branches 1 Tag
2d94e00267e95e3fc23ea116d0022b9ee06c620b
Commit Graph

28050 Commits

Author SHA1 Message Date
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
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
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
Anewbe
87929b51d0 Merge pull request #5343 from ReddeyfishVor/slimeChanges 
prevent slimes from spawning on top of people
 2018-06-11 13:10:24 -05:00
Anewbe
58cca27282 Robolimb brand damage tweaks, makes VeyMed more fragile (#5183) 
* Robolimb brand damage tweaks, makes VeyMed more fragile

* Lessens VeyMed damage malus to 10%.
 2018-06-10 17:48:04 -07:00
Atermonera
6f5491de67 Merge pull request #5341 from Anewbe/catwalks_again 
Wires are under catwalks, fueltanks are over floor decals
 2018-06-10 12:41:06 -07:00
Atermonera
e7ea5b1c69 Merge pull request #5339 from Anewbe/eye_color 
Change-Eye-Color verb should work again
 2018-06-10 12:38:58 -07:00
Reddeyfish
0a616af465 prevent slimes from spawning on top of people 2018-06-10 11:42:42 -07:00
Atermonera
456a1aa37e Merge pull request #5333 from Anewbe/mining_turf_tweak 
Mining turf overlays should be properly placed now
 2018-06-09 12:42:10 -07:00
Anewbe
05fa92c489 Wires are under catwalks, fueltanks are over floor decals 2018-06-09 13:26:30 -05:00
Anewbe
a8be0c1c82 Change-Eye-Color verb should work again 2018-06-08 18:54:49 -05:00
Anewbe
284b60212b Cult robes use the right sprite again 2018-06-06 21:33:30 -05:00
Anewbe
17a295b579 Ports some Bay hair code 2018-06-06 20:20:23 -05:00
Anewbe
73b4b3fe50 Merge pull request #5334 from Atermonera/aters_a_donk_round2 
Ater forgot to remove debug code
 2018-06-06 19:37:02 -05:00
Atermonera
ee6a7125cf Ater forgot to remove debug code 2018-06-06 16:59:17 -07:00
Anewbe
7d23980df4 Mining turf overlays should be properly placed now 2018-06-06 18:09:07 -05:00
Atermonera
82628ef097 Merge pull request #5323 from Anewbe/loadsamoney 
Wallet money spawns as a bundle.
 2018-06-06 16:07:53 -07:00
Anewbe
935cfaec3c Merge pull request #5330 from Mechoid/SeedpocalypseTheFirst 
Fix #5321
 2018-06-06 17:49:49 -05:00
Mechoid
d159528899 Fix #5316 and #5220 2018-06-05 20:59:12 -07:00
Mechoid
b455abf2b6 Fix https://github.com/PolarisSS13/Polaris/issues/5321 2018-06-05 20:29:59 -07:00
Anewbe
eb0ead6785 Merge pull request #5325 from elgeonmb/patch-7 
Changes experimental welder fluff
 2018-06-04 15:13:19 -05:00
Mechoid
35e974e3a0 Ion Rifle returned to original radius. (#5326) 
* Return ion rifles to their intended 3x3 rather than 5x5.

* Changelog
 2018-06-04 15:13:10 -05:00
Cameron653
b8008e454b Changes Setup Character" to "Character Setup" 
Since that's what is used everywhere else.
 2018-06-03 15:32:42 -04:00
Atermonera
493a497d25 Merge pull request #5301 from Anewbe/more_merc_mob_things 
Adds armor to certain mobs, mercs have knives
 2018-06-03 00:58:07 -07:00
elgeonmb
e537e9b8e8 you made me do this 2018-06-02 17:56:47 -07:00
Anewbe
237db1e90e Wallet money spawns as a bundle. 2018-06-02 16:16:54 -05:00
Anewbe
c8919e0c9f Merge pull request #5319 from SubberTheFabulous/LoveBranded 
Adds two new sets of robolimbs
 2018-06-02 15:22:15 -05:00
Anewbe
9d44725112 Merge pull request #5320 from VOREStation/pol-hoods 
Radiation closet hood fix
 2018-06-02 15:22:05 -05:00
Anewbe
5ee264dc21 Merge pull request #5305 from VOREStation/pol-autosay 
Prevent autosay() from creating/deleting AIs
 2018-06-02 11:46:38 -05:00
Arokha Sieyes
53cb0b70a5 Radiation closet hood fix 2018-06-01 23:52:00 -04:00
SubberTheFabulous
4c6f5add29 Two new unbranded prosthesis 2018-06-01 23:15:25 +07:00
Anewbe
83286102e0 Merge pull request #5314 from VOREStation/pol-encasedfracture 
Fix surgery breaking bones when performed correctly
 2018-05-31 21:06:49 -05:00
Anewbe
768773b82a Merge pull request #5318 from Heroman3003/xenoarch-multitool-fix 
Fixed xenoarch multitool being unmakeable
 2018-05-31 20:33:22 -05:00
Anewbe
720f7b2352 Merge pull request #5310 from Heroman3003/arcade-fix 
Fixed arcades dispensing their own board
 2018-05-31 20:32:40 -05:00
Anewbe
61be543800 Merge pull request #5313 from VOREStation/pol-joblogmove 
Move character join log statement
 2018-05-31 20:32:12 -05:00
Heroman3003
77a00e53d1 fixed xenoarch multitool being unmakeable 2018-05-31 13:01:40 +10:00
Mechoid
8178c2bf1f Merge pull request #5289 from fludd12/splat 
Prometheans can now be revived as originally intended.
 2018-05-30 18:13:26 -07:00
Arokha Sieyes
48bf825472 Fix surgery breaking bones when performed correctly 
I have to believe this is somehow misplaced. "Whoops!"
 2018-05-29 14:40:54 -04:00
Anewbe
d308cb4563 Merge pull request #5269 from deathride58/fancylighting 
Makes lighting a little fancier, reduces the amount of light sources with a power greater than 1
 2018-05-29 13:33:27 -05:00
Anewbe
9fad848847 Merge pull request #5308 from VOREStation/pol-mineoverlays 
Rewrite mine turf overlay adding
 2018-05-29 13:32:39 -05:00
Anewbe
fe65dd22a4 Merge pull request #5309 from Heroman3003/melon-fix 
Fixed fruit salad not being make-able
 2018-05-29 13:32:21 -05:00
Anewbe
66ceb6862a Merge pull request #5311 from VOREStation/pol-proxghosts 
Fixes #5083
 2018-05-29 13:31:57 -05:00
Arokha Sieyes
fb9bfd8639 Move character join log statement 
Was only logging latejoins due to where this line was placed. Moved it into job controller to catch any time anyone is assigned a job period.
 2018-05-29 14:26:23 -04:00