Commit Graph

3887 Commits

Author SHA1 Message Date
Anewbe
77886b648c Fixes a travis issue 2017-03-27 23:22:36 -05:00
Anewbe
d66e1beca0 Adds the electric welder 2017-03-27 22:43:20 -05:00
Anewbe
73ab115295 Fixes a thing. 2017-03-27 22:32:02 -05:00
Schnayy
e4ca4707d1 Fixed code at Neerti's request, fixed a small sprite error where crowns appeared in the wrong hand. 2017-03-27 21:24:47 -05:00
Schnayy
0f98eedab4 Fixed indentation 2017-03-27 17:16:06 -05:00
Schnayy
971eb97399 Fixed conflict? Maybe? Please? 2017-03-27 00:42:39 -05:00
Anewbe
431dd1d290 Adds taking drags from smokables 2017-03-26 18:07:35 -05:00
Cerebulon
6472f02040 Removed unnecessary icon_state code. Added basic scanner sprite. 2017-03-26 22:00:09 +01:00
Cerebulon
3c17d1b33f Added in-hand sprites to most item lacking them from the Medical department.
(Full list: Body bag, Advanced Mass Spectrometer, Rescue Suit Control Module, Stethoscope, Stasis bag, Defibrillator, Blood Packs, Advanced Trauma/Burn Kits, Hypospray, Biopsy Scanner, Surgical Drill, Fixovein, Retractor, Bone-Gel, Bone Setter, Cautery, Hemostat, Inflatable Wall Box.
2017-03-26 07:04:01 +01:00
Anewbe
88b0c6086e Antag Radio changes 2017-03-25 14:19:57 -05:00
Anewbe
3816d634ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into armor_soak
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
2017-03-24 16:35:31 -05:00
Cerebulon
38571fb8bc Adds in-hand sprites to several items.
Hand labeller, light replacer, megaphone, binoculars, powersink, suit cooler and lantern.
2017-03-23 22:03:17 +00:00
Anewbe
a80ea977d1 Adds Boxcutters 2017-03-23 15:27:48 -05:00
MagmaRam
e3a87c1c78 Merge pull request #2985 from Anewbe/more_pdas
Adds rugged style PDAs
2017-03-22 19:42:19 -05: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
Anewbe
538f91c202 Borg stun arm should work now. 2017-03-22 17:06:16 -05:00
Anewbe
c65588b099 Communicator QoL 2017-03-21 00:51:26 -05:00
Anewbe
cb23c72d8d Adds the whetstone 2017-03-20 23:32:52 -05:00
nachomeep
83cc019562 Fixes phoron sprites. (#3100)
* Fixes phoron sprites.

* Re-adds the phoron-tank changes for the vox???

* touches up tank sprites
2017-03-20 19:31:42 -05:00
Anewbe
bf307ac0dc Translators can't output hive or nonverbal languages 2017-03-15 20:56:18 -05:00
Neerti
d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Neerti
e08b8edbd3 Merge pull request #3077 from Anewbe/translator
Ports the translator
2017-03-14 21:23:13 -04:00
Neerti
88d62cffdb work 2017-03-14 08:04:29 -04:00
Anewbe
ab1812d9ff Adds the ear translator 2017-03-13 20:03:45 -05:00
Anewbe
e2680eff87 Merge pull request #3063 from Anewbe/tank_fix
Changes tank sprite for Vox
2017-03-12 19:26:07 -05:00
Anewbe
f4dd443b01 Ports the translator 2017-03-10 21:46:57 -06:00
Anewbe
ac79f548e7 Sorta implements armor soak, very WIP 2017-03-10 20:26:37 -06:00
Anewbe
7130d56b80 Merge pull request #3064 from Woodratt/WR_SC_Changes
WR_SC_Map_Changes
2017-03-08 19:58:46 -06:00
woodratt
19fb047f01 WR_SC_Map_Changes
- Fixes sprite issues with departmental intercoms.
- Tweaks to the random objects dm
- Copies Bay's flora and warning sign list, as well as ports some of their signs.
- Addition of a couple new floor decals.
- New table preset, wooden reinforced.
2017-03-08 17:44:48 -08:00
Anewbe
0465613465 Changes tank sprite for Vox 2017-03-08 12:36:43 -06:00
Neerti
fc75357c61 Merge pull request #3054 from Anewbe/healthscanner
Oxyloss shows as cyan
2017-03-06 18:59:27 -05:00
Anewbe
b4ec8eb026 Oxyloss shows as cyan 2017-03-05 14:19:51 -06:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Leshana
340a393161 Extend Station Blueprints to consider outdoor mining areas as "space"
* Allows constructing new rooms out of the asteroid!  Previously blueprint couldn't because it wasn't technically "/area/space"
* Also moved the list of what area types count as space or protected to variables so its not a list embedded in the middle of a proc...
2017-03-03 20:12:03 -05:00
Anewbe
facd055d07 Merge pull request #3037 from VOREStation/traybuckle
Fix two extra robust bugs
2017-03-03 18:23:25 -06:00
Arokha Sieyes
f7c22dc54d Fix two extra robust bugs
Trays have no attack cooldown because they have this crazy-long snowflake code for attacks.

Beds (and children like chairs) don't track target for grab-buckle do_after, letting them run away and get teleported back to the chair and buckled regardless of their efforts.
2017-03-03 16:25:53 -05: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
acf30da072 Merge pull request #3033 from VOREStation/surgidesc
Fixes descriptions on 3 surgical tools
2017-03-02 15:23:27 -06:00
Arokha Sieyes
55d5c2d615 Fixes descriptions on 3 surgical tools
Someone forgot theeeese. So they showed the "Ahelp this" description.
2017-03-02 14:08:13 -05:00
Neerti
561f10bced Merge pull request #3013 from Anewbe/lung_cancer
Minor smoking update
2017-02-28 21:28:27 -05: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
Anewbe
734536bcb9 Material weapon rework 2017-02-24 18:51:44 -06:00
Anewbe
a85e170ce4 Minor smoking update 2017-02-24 17:15:38 -06:00
Anewbe
9d0fd9b866 Merge pull request #3005 from Leshana/papershredder-enhancement
Enhances the Paper Shredder
2017-02-23 11:28:28 -06:00
Leshana
d7b82fc719 Added new "default_apply_parts" facility to machines to create default parts.
* Every constructable machine with a circuit board needs to create its required parts in its constructor.  These parts must be the same parts specified in the machine's circuit board, otherwise you get the wrong parts when you deconstruct.  This creates an opportunity for error which we can eliminate by reading the circuit board's part list and just adding those to the machine directly!  Plus its less tedious.
* Implemented it on the jukebox.
2017-02-22 17:28:24 -05: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
Leshana
283b58e93d Fixes dragging clothing with storage onto an occupied hand
* If you mouse-drag certain items onto a hand which is already holding something, the item goes into limbo.
* The reason this happens is that the standard code handling drags is directly calling usr.u_equip, despite the comment on that proc clearly saying never to do that.  So it just throws it to limbo and the next line attempting to put it in hand does nothing becuase the hand is occupied.   Better way is to call unEquip, so the item will drop on the ground if it fails.
* Fixes https://github.com/VOREStation/VOREStation/issues/394
2017-02-09 14:49:13 -05:00