Commit Graph

6462 Commits

Author SHA1 Message Date
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
Mechoid
56ec5ec94c Adds three flame-themed illegal Mech weapons and more. (#4058)
* Adds three flame-themed illegal Mech weapons. Allows anything using apply_effects to be incendiary and ignite/apply firestacks. Also absolute-paths the spilled fuel effects.

* Removes world << because I'm a good coder honest.

* Why does Git do this for no reason.
2017-10-13 23:32:52 -05: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
Anewbe
f9fd492caf Merge pull request #4060 from Neerti/10/13/2017_balling_out_of_control
Adds the Ionic Rapier
2017-10-13 23:31:38 -05:00
Anewbe
15ece5cd98 Merge pull request #4042 from MisterLayne/10/10/2017_AddsTRays
Implements new T-Rays
2017-10-13 09:49:28 -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
Belsima
3069df74a4 Spelling + drone (#4050) 2017-10-12 11:14:46 -05:00
Neerti
7cafd7d239 Merge pull request #4002 from Anewbe/outfits
Ports Bay's outfit system
2017-10-11 22:00:45 -04:00
MisterLayne
392aa1d8bc Makes the new T-Ray Scanners available 2017-10-11 17:11:49 -04:00
Neerti
d848197534 Merge pull request #4029 from Anewbe/skeletons
Adds Skeletons for background use
2017-10-11 14:48:41 -04:00
Neerti
1f0bb5891c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles
# Conflicts resolved:
#	code/modules/busy_space/organizations.dm
2017-10-10 01:19:53 -04:00
Neerti
7225ea2b66 Read github PR for details. 2017-10-10 00:48:27 -04:00
Neerti
b4a1e16132 Merge pull request #4027 from Anewbe/landmark_fixes
Landmark fixes
2017-10-09 03:41:47 -04:00
Anewbe
ff7c4fe45a Makes a bunch of things fit in holsters 2017-10-07 17:24:18 -05: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
Anewbe
098bb66e4a Makes landmarks invisible, mobcorpse landmark actually despawns 2017-10-05 21:44:26 -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
Neerti
cf263e348e Merge pull request #3981 from Anewbe/gravetender
Adds the gravekeeper lost borg module
2017-10-03 23:01:15 -04: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
b47ac1d76c Merge pull request #3991 from MisterLayne/9/30/17_BetterTRAY
Better T-Ray Scanners
2017-10-01 10:58:35 -05:00
Anewbe
5828e126fe Merge pull request #3995 from Cameron653/patch-5
Removes second definition of katana
2017-10-01 10:43:03 -05:00
Anewbe
1b7ecf6789 Ports Bay's outfit system 2017-10-01 02:31:37 -05:00
Neerti
bc6f98c23a Merge pull request #3987 from Anewbe/frost_spider_poi
Adds a frost spider nest PoI, adds frost spider things
2017-10-01 01:26:55 -04:00
Anewbe
4dd9a4dbf2 Corrects the autospawn pod timer 2017-09-30 21:38:23 -05:00
Cameron653
9b7ed4fbcc Katana was defined twice 2017-09-30 17:35:11 -04:00
MisterLayne
568c9554ed Adds better Tscanners. 2017-09-30 10:59:38 -04:00
Anewbe
d067f70403 Adds the thing that spawns the gravekeeper drone 2017-09-30 02:00:10 -05:00
Mechoid
77f0e7514c Combat exosuits can now actually punch through walls and girders again, based on their 'force'. Fixes some to_chat's. 2017-09-29 22:10:48 -07:00
Anewbe
b3fdf3836e Adds a frost spider nest PoI, adds frost spider things 2017-09-29 22:01:41 -05:00
Anewbe
a5acb5d1bb Merge pull request #3971 from Neerti/9/28/2017_stack_asthetics
Adds differing stack sprites
2017-09-29 16:07:04 -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
Neerti
d2b3e7344c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_stack_asthetics 2017-09-28 01:06:04 -04:00
Neerti
2f173dd16b Adds differing stack sprites
Ports most of /tg/'s sprites for stacks displaying their contents.  I added some of my own as well to fill in materials that we have but they didn't.
Moves all stack icons to their own dmi.
Reworks fifty_spawners to use paths instead of strings, as it prevents bugs in the long term.
2017-09-28 01:04:19 -04:00
Anewbe
7a13c8136f Finishing touches on gravemarkers 2017-09-27 18:59:26 -05:00