cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-25 16:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,350 Commits 2 Branches 1 Tag
d81b1b2cbab413850fd5d67116a00a7d09c20d72
Commit Graph

2549 Commits

Author SHA1 Message Date
Anewbe
303b7096ef Merge pull request #4194 from Mechoid/Welderpack_Tanks 
Adds a mounted welder to the welderpacks in Engineering.
 2017-11-02 20:38:10 -05:00
Mechoid
794bd0ab6f Adds a mounted welder to the welderpacks in engineering. 2017-10-31 20:07:14 -07:00
Anewbe
73ad06c706 Botanist ID now has the proper default job/title 2017-10-31 20:41:15 -05:00
Anewbe
65eb398677 Fixes the access config issue 2017-10-26 17:34:15 -05:00
Anewbe
7a36a8cfb6 Merge pull request #4118 from mistyLuminescence/cryostorage 
Reworks cryopod storage
 2017-10-22 19:03:07 -05:00
Anewbe
6774a1b5f2 Merge pull request #4129 from Belsima/centcolor 
Recolors some CentComm items to use NT colors.
 2017-10-22 18:55:21 -05:00
Belsima
8363f34044 Recolors some CentComm items to use NT colors. 2017-10-21 09:21:20 -04:00
mistyLuminescence
ae308a3a91 Reworks cryopod storage 2017-10-20 19:14:45 +01:00
Neerti
9c0ac5ec2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/20/2017_syndie_borgs_are_back 2017-10-20 13:26:06 -04:00
Neerti
1aff3fc8c0 Syndicate Borgs II, Return of the Salt 
Adds an option in mercenary uplinks to purchase three different 'classes' of drones.
See PR for more details.
 2017-10-20 13:01:45 -04:00
Mechoid
920e823a46 Fuel-Rod Gun, Minor fixes related. (#4103) 
* A whole load of things.

* Fixes the SM Rod's travel distance.
 2017-10-19 15:07:52 -05:00
mistyLuminescence
e76447a719 Loadout stuff, but done right! (#4094) 
* Loadout and accessory path tweaks.

* updated: armbands

* except it's better now

* no ian shirt and psych medHUD, travis fixed?

* OKAY ROUND THREE
 2017-10-19 09:36:15 -05:00
killer653
0080539924 More fixes 2017-10-15 19:54:50 -04:00
Ansari
768dc2d7c0 Port over Chemistry bag from Paradise (#4067) 
* Add in chemistry bag from Paradise, based on /tg/ bag. Add it to biogenerator. Add it to wardrobe.

* Make itemsize large so it cannot be put in backpack. Slowdown = 1.
 2017-10-15 15:04:56 -05:00
Neerti
0a3d85647a Merge pull request #4011 from Anewbe/railgun 
Ports Bay's railguns, and assorted gun sprites
 2017-10-14 01:43:45 -04:00
Belsima
e61efc752a more gammers (#4052) 
* Update medsci.dm

* Update miscellaneous.dm

* Update arcade.dm

* Update transform.dm

* Update implanter.dm

* Update shuttle_console.dm
 2017-10-13 23:32:22 -05:00
Neerti
0e57b66f6a Adds an Esword subtype that wrecks synthetics. 
Ports /tg/'s esword and double esword sprites, both item and inhands.
Hivebot isSynthetic() now returns true.
 2017-10-13 02:17:27 -04:00
Neerti
7cafd7d239 Merge pull request #4002 from Anewbe/outfits 
Ports Bay's outfit system
 2017-10-11 22:00:45 -04:00
Anewbe
1f9a14ffd7 Adds Skeletons for background use 2017-10-06 20:40:12 -05:00
Anewbe
ccd90031fa Merge pull request #4018 from MisterLayne/10/4/2017_DufflebagsSci 
Science Dufflebag
 2017-10-06 10:51:05 -05:00
MisterLayne
8aed98be14 Adds science dufflebag 2017-10-05 16:26:56 -04:00
Anewbe
66837464d2 Implanters should have an icon again 2017-10-04 23:07:59 -05:00
Anewbe
82f24079f4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 
# Conflicts:
#	code/game/jobs/job/assistant.dm
#	code/game/jobs/job/civilian.dm
#	code/modules/admin/admin_verbs.dm
 2017-10-04 20:08:55 -05:00
Anewbe
10b0264c6a Yet more work on the Outfit System 2017-10-04 20:05:20 -05:00
Neerti
4db89d42f5 Merge pull request #4014 from Anewbe/drone_permits 
Drone permits can now be worn
 2017-10-04 20:59:29 -04:00
Anewbe
2fde466a21 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 2017-10-03 23:24:12 -05:00
Anewbe
b393bb897d Repaths permits as accessories 2017-10-03 00:04:58 -05:00
Anewbe
bf6c9ba4b8 Drone permits can now be worn 2017-10-02 23:14:14 -05:00
Anewbe
a248a4a4a1 Ports Bay's railguns, and assorted gun sprites 2017-10-02 17:29:24 -05:00
Anewbe
5e635aff46 Adds a hacky method to put loadout implants in the user's antag records. Fixes a runtime. 2017-10-02 00:11:27 -05:00
Anewbe
46e411f80f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into tracking_implant 2017-10-01 21:52:36 -05:00
Anewbe
d0a22df9c3 Continues work on outfits 2017-10-01 20:50:30 -05:00
Anewbe
e82ea2d599 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix 
# Conflicts:
#	icons/obj/items.dmi
 2017-10-01 13:13:13 -05:00
Anewbe
1b7ecf6789 Ports Bay's outfit system 2017-10-01 02:31:37 -05:00
Anewbe
969aa45e9a Switches 2 for DEAD 2017-09-29 12:07:16 -05:00
Anewbe
7c5d7c4d75 Improves tracking implant code, adds a tracking implant variant to the loadout 2017-09-28 20:25:46 -05:00
Anewbe
dffb3a6fef Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scythe 
# Conflicts:
#	icons/obj/weapons.dmi
 2017-09-28 16:07:45 -05:00
Anewbe
ef1749009a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix 
# Conflicts:
#	icons/obj/items.dmi
 2017-09-28 15:56:53 -05:00
Neerti
d4dd908f94 Merge pull request #3962 from Anewbe/gravestone 
Adds grave markers
 2017-09-28 16:22:46 -04:00
Anewbe
7a13c8136f Finishing touches on gravemarkers 2017-09-27 18:59:26 -05:00
Neerti
853d8e80f1 Merge pull request #3914 from Anewbe/bone_fixer 
Adds the bone clamp, and some alien surgery tools
 2017-09-27 19:06:32 -04:00
Neerti
ab76e6d612 Merge pull request #3958 from Anewbe/legcuffs 
Changes Legcuff sprites
 2017-09-27 19:05:32 -04:00
Anewbe
eed312a8fb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into gravestone 
# Conflicts:
#	icons/obj/structures.dmi
 2017-09-27 13:49:56 -05:00
Anewbe
73ddd22296 Implanter tweaks 2017-09-27 11:59:59 -05:00
Anewbe
47f2854bb7 Makes the scythe a child of fireaxes, adds it to the weed control crate 2017-09-26 22:15:33 -05:00
Anewbe
280f3010f8 Adds grave markers 2017-09-26 21:03:34 -05:00
Anewbe
a4dd5056b0 Changes Legcuff sprites 2017-09-26 05:48:59 -05:00
Anewbe
caa4fecd8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bone_fixer 
# Conflicts:
#	icons/obj/abductor.dmi
 2017-09-25 20:35:19 -05:00
Woodratt
9f806e2f67 Syndicate ID changes 
- Added a Syndicate ID with all access (admin spawn only).
- Port of 'Syndicate id cards now listen for owner destruction' from Bay. Link https://github.com/Baystation12/Baystation12/pull/11563
 2017-09-25 17:01:55 -07:00
Neerti
20ea71934c Merge pull request #3919 from Anewbe/tech_shifting 
Shifts around a few Tech Levels.
 2017-09-24 00:09:02 -04:00