cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 13:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,682 Commits 5 Branches 1 Tag
85d3cbfa12072b5810dc12d63f0ac577a68d8ec4
Commit Graph

1268 Commits

Author SHA1 Message Date
Mechoid
bbeb578a7e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1 
# Fix Conflicts:
#	code/game/objects/items/weapons/grenades/explosive.dm
 2018-08-24 16:05:35 -07:00
Atermonera
422bd2545c Merge pull request #5516 from Anewbe/fragmentation 
Adds a new subset of grenades that shoot projectiles
 2018-08-24 15:47:01 -07:00
Atermonera
1cfefcf2ec Merge pull request #5501 from Anewbe/magazine_things 
Adds smart magazine, magazine functionality
 2018-08-24 14:35:55 -07:00
Mechoid
be703cee04 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1 2018-08-23 20:17:49 -07:00
Mechoid
509addffdf Adds a whole bunch of Exosuit weapons and other miscellaneous parts. 2018-08-23 20:14:56 -07:00
Anewbe
4fc23e4051 Adds a new subset of grenades that shoot projectiles 2018-08-21 22:17:04 -05:00
Anewbe
6a40982a48 Converts a number of simple_animals into their simple_mob variants (#5510) 
* 125 commits merged from master

* Converts a number of simple_animal mobs to the new format

* Grammar fixes
 2018-08-21 18:38:18 -07:00
Anewbe
ee48151135 Adds smart magazine, magazine functionality 2018-08-21 17:10:40 -05:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Anewbe
b88b70eb61 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-03 19:53:06 -05:00
Anewbe
c2794c571d Hopefully fixes some tool-conversion things 2018-08-03 15:13:29 -05:00
Anewbe
c652369f34 Merge pull request #5464 from Neerti/arc_projectile_fix 
Makes arcing projectiles exist in the code.
 2018-08-03 10:37:03 -05:00
Anewbe
7f84aeab9f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-02 22:35:14 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Neerti
75048b8e14 btw i use arc 2018-08-02 15:11:09 -04:00
Mechoid
8acd0ca4fc Adds beams to the Type var selection in View Variables. 2018-07-31 11:03:48 -07:00
Mechoid
b1a91fc0e3 Unfuck my Master 2018-07-31 11:02:09 -07:00
Mechoid
25e8739dfc Adds beams to the Type var list for View Variables. 2018-07-31 11:00:17 -07:00
Anewbe
75fa598e5c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into make_ai_great_again 2018-07-25 17:28:37 -05:00
Neerti
066975bad0 Fixes some layering issues with trees, outdoor turf edges, and the targeting indicator. 2018-07-24 13:30:09 -04:00
Anewbe
bee5c030ec Fixes a few on-mob gun sprites 2018-07-21 21:35:08 -05:00
Anewbe
64d16a0a56 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into make_ai_great_again 2018-07-21 12:49:19 -05:00
Kates
535cca9d0e Saber fix. (#5384) 
* Saber fix.

* Saber fix 2: Electric boogaloo

* parenthèse

* "And another one"

* Actually fixes the indentation

* Balance revert
 2018-07-10 23:49:11 -05:00
Anewbe
eb02140608 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into make_ai_great_again 2018-06-18 17:12:33 -05:00
Atermonera
04d5f9e522 Merge pull request #5359 from Anewbe/arc_projectiles 
Adds arcing projectiles
 2018-06-17 12:58:41 -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
Anewbe
6b8746956a Adds arcing projectiles 2018-06-16 11:37:41 -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
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
Neerti
7b61dc16c1 Hivebots 2018-05-21 21:12:47 -04:00
Atermonera
4828319605 Merge pull request #5212 from Woodratt/04252018_POIstage05 
PoI Stage 0.5
 2018-04-28 20:48:30 -07:00
Leshana
d05163baba Fix missing descriptions on guns. 
examine() is supposed to return a value, these ones did not.
 2018-04-27 09:48:43 -04:00
Woodratt
c32bcf785a PoI Stage 0.5 
Doing this in smaller bits

- New random sif mob selector, peaceful animals
- Drone lootpile (basic placeholder loot right now until we figure out how to give them proper drone loot)
- New random spider mob selector, nurse spider and nurse hat spider (hat spider has 10 more health points and is a rare chance to spawn, woo)
- New spacesuit random spawn, medical space suits
- New Random Shotgun spawn
- New random gun spawns
- Fixed icon for random medicine spawn
- Fixed broken icon for 44 magazines
- Fixed Ice Cave dungeon walls being called 'steel'
- Added new Crystal type, to avoid the SM style crystal from spawning in crystal PoIs
 2018-04-25 22:11:30 -07:00
Mechoid
57ab0e715b Constructs 2.0 - Living Stone (#5040) 
* Construct Overhaul + Related Fixes/Tweaks
 2018-04-04 23:45:00 -07:00
Neerti
bac28e72de Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again 2018-04-03 22:16:16 -04:00
Anewbe
6caa8e08cf Merge pull request #5113 from Woodratt/03262018_44revolver 
44 revolvers
 2018-03-30 17:46:37 -05:00
Aronai Sieyes
7d3aec96fd Arranges lots of things into planes (#5072) 
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
 2018-03-28 12:59:12 -07:00
Woodratt
32860140b4 44 revolvers 
Port from Bay

- Addition of two more revolvers in 44 cal for variety
- Creation of rubber rounds for 44 cal (stats taken from virgo no idea how good they are in actual fights)
- Includes 44 ammo speedloaders, regular and rubber speedloaders
- Slight adjustments to allow for firing animations taken from Bay (the mosley revolver has a firing animation that plays)
- Includes in hand sprites

We did already have the 'webley' sprite (it exists in a recolored sprite). However it is a alternate sprite for the detective's 45 revolver. This brings it in as a actual proper revolver with sprites that are different than the detectives revolver, and maybe in the future can be thrown into loot lists and PoIs.
 2018-03-26 14:33:43 -07:00
Arokha Sieyes
e8258ff13f POLARIS: Beam weapons runtime when you shoot yourself 2018-03-25 17:09:56 -04:00
Neerti
70ac478aea Merge pull request #5065 from VOREStation/vs-port-3204 
[PORT] Revamp logging for consistency
 2018-03-20 21:13:47 -04:00
Arokha Sieyes
73838e0a62 POLARIS: Revamp logging to be consistent 2018-03-13 18:20:58 -04:00
Anewbe
09effef4f9 More projectiles now ignite things 2018-03-11 15:47:48 -05:00
Mechoid
9cd4bde3d1 Test Projectiles can pass through things other projectiles are capable of, and unanchored structures. 2018-02-23 21:27:41 -08:00
Anewbe
63667c4a02 Merge pull request #4927 from VOREStation/pol-gun 
Fix mode_name on guns always being null
 2018-02-23 13:18:36 -06:00
Arokha Sieyes
3680b0382a POLARIS: Fix mode_name on guns always being null 2018-02-22 20:03:54 -05:00
Anewbe
153009e03c Ports more two-handed gun sprites from Bay 2018-02-21 01:57:56 -06:00
Anewbe
82889f60a2 Corrects a few accuracy/evasion errors (#4864) 2018-02-18 11:44:43 -08:00
elgeonmb
c359d8aae4 unions no longer make firearms (#4836) 2018-02-17 20:40:15 -08:00