Commit Graph

2980 Commits

Author SHA1 Message Date
Leshana f93141d7d3 Merge remote-tracking branch 'polaris/master'
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	vorestation.dme
2017-03-22 20:08:29 -04:00
Anewbe 2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
nachomeep e1554f323b Adds engineering + science crates (#3072)
* Adds engineering + scicrates.

* Enables the science crate

* Updates engineering crate icons.

* Inflatables don't need security.

* fixes RCD crates
2017-03-21 18:38:47 -05:00
Arokha Sieyes 185f920f70 Update name spelling of heph 2017-03-21 11:32:36 -04:00
Arokha Sieyes be9bcf81f0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-03-21 11:22:29 -04:00
Neerti 7f14550a9a Merge pull request #3010 from Anewbe/cargo_heph
Readds HI prosthetics, corrects naming
2017-03-21 00:27:00 -04:00
Anewbe 4779baf872 Spelling 2017-03-20 20:14:48 -05:00
Leshana 5c3172389e Make jukebox controllable by its wires
Added four extra hacking wires to the jukebox for Play, Stop, Next, and Prev.  The main purpose is to allow attaching of singallers for remote controlling the jukebox.
2017-03-20 19:01:33 -04:00
Leshana d8c96082f4 Make jukebox controllable by its wires
Added four extra hacking wires to the jukebox for Play, Stop, Next, and Prev.  The main purpose is to allow attaching of singallers for remote controlling the jukebox.
2017-03-20 18:24:18 -04:00
Screemonster 87f940293a adds particle guns to science and cargo 2017-03-09 18:10:26 +00:00
Arokha Sieyes fa59590019 Merge pull request #1135 from VOREStation/aro-adminbus
WIP Event ship and smaller shuttle
2017-03-08 18:28:55 -05:00
Arokha Sieyes 80e513657c WIP Event ship and smaller shuttle
WIP on Virgo-2.dmm, Joan must help finish it :O
2017-03-08 17:57:29 -05:00
Leshana f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Anewbe 05e6ef5ad8 Merge pull request #2988 from Anewbe/boots
Boots are now a subtype of shoes
2017-03-05 14:13:47 -06:00
Neerti d5438dc36d Fixes two bugs. 2017-03-03 10:09:45 -05:00
Neerti 0f781e36a7 Adds Multi-Z Test Map 2017-03-03 09:40:34 -05:00
Arokha Sieyes 387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Anewbe 25b925f04c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots
# Conflicts:
#	maps/northern_star/polaris-1.dmm
#	maps/northern_star/polaris-2.dmm
2017-03-02 16:53:29 -06:00
Anewbe bb2adf1290 Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system
Ports a large chunk of the map datum system that europa/bay uses.
2017-03-02 16:32:02 -06:00
Anewbe 8875c5ce1f Merge pull request #3027 from VOREStation/implanters
Make implanters able to be created
2017-02-28 20:26:48 -06:00
Arokha Sieyes 50a8b94294 Make implanters able to be created
Under 'medical' in the autolathe. 1 sheet metal, 1 sheet glass (syringes were 2 sheets total so just keeping with that).
2017-02-28 16:25:55 -05:00
Neerti 12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
Leshana 3781494933 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-23 18:25:37 -05:00
Anewbe 9d6a11e17d Readds HI prosthetics, corrects naming 2017-02-23 14:41:24 -06:00
Leshana dbd3622588 Enhances the Paper Shredder
* Makes the paper shredder constructable and deconstructable.
* Switches to some new sprites which are animated!
* Machine now requires power, icons respond to power on/off etc.
2017-02-21 19:21:32 -05:00
Anewbe 2de037fbbf Ports a bunch of fluff stuff 2017-02-21 13:50:14 -06:00
Arokha Sieyes e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Anewbe 7417bef794 Boots are now a subtype of shoes 2017-02-05 16:17:41 -06:00
Anewbe 3833a404c7 Antag announcement papertrail 2017-02-05 01:13:07 -06:00
killer653 3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Dhaeleena 2fef35d980 Lots of changes and Fluff fixes 2017-01-26 11:48:22 -03:00
Anewbe 83db0cc38f Medical tweaks 2017-01-23 23:43:44 -06:00
Anewbe ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Anewbe fda82d4b17 Hood tweaks 2017-01-18 17:02:01 -06:00
Anewbe d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
Anewbe cedf6b41a0 Fixes the longjohn shirt sprite 2017-01-16 21:20:49 -06:00
killer653 832418c7c9 Polaris sync 2017-01-15 18:12:15 -05:00
Anewbe a4471556b1 Ports a bunch of Baystation's underclothes and hair 2017-01-11 19:12:49 -06:00
Neerti e45fb628f4 Adds Telecomms Logging to EPv2
The Exonet Node now has a log window, showing all successful message transmissions that pass through it.  Each line contains information about the origin address, target address, the message type, and the contents of the message.
Changes the documentation for some procs to be more clear on what they're actually doing.
2017-01-07 13:21:03 -05:00
Anewbe 2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
killer653 9c359cb202 Polaris sync 2016-12-27 08:21:55 -05:00
MagmaRam aa0ae1c676 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into fifty_stacks 2016-12-18 13:43:20 -06:00
Anewbe a45b1ab846 Merge pull request #2861 from MagmaRam/defibcrate
Adds a crate with defibrilators for 30 points
2016-12-18 13:40:42 -06:00
MagmaRam 190a2bc70c Replaces [stack]/fifty atoms with atoms that spawn the normal stack
The stack/fifty objects were really buggy, this should fix all of that in one go.
2016-12-17 17:27:04 -06:00
MagmaRam d3be058c5d Adds a crate with defibrilators for 30 points 2016-12-17 09:46:05 -06:00
Neerti 68b1a3e355 Vending machines now correctly throw products 2016-12-17 03:30:14 -05:00
killer653 0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
ForFoxSake 451f48e621 Enable overriding of the underwear icon file. 2016-12-09 13:30:38 +00:00
woodratt 454e6870d9 1.6.3 Ports of Bay's suit clothing
- Whole scale port of clothing items from bay.
- Solgov armor vests, as well as a 'tactical vest' (None avail. in game)
- Alternate atmos, engineering, mining, medical, and security suits. (Due to their stats, only available through cargo).
- Three new hazard vest colors, blue, green, white. (Load out option)
- 'Service jackets' Black and Green (Load out option).
- Solgov fleet dress uniforms, surgical apron, marshal jacket (None avail. in game, may change with the surgical apron in the future.)
- As a side change the Construction, HAZMAT, Biohazard, and EMT voidsuits are also now available from cargo. HAZMAT and Biohzard come with slightly adjusted stats to sort of reflect what they are designed for.
2016-11-24 19:19:26 -08:00
Anewbe 5397b162c8 Merge pull request #2777 from SpadesNeil/crate-fix
Fixes stupid naming of weapon crates
2016-11-19 12:03:00 -06:00