Anewbe
14b9f7ce79
Adds bench presets
2017-03-24 22:46:43 -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
Anewbe
3c1d897fc4
Actually gets the HI name right
2017-03-24 15:27:55 -05:00
Anewbe
19231a9e5b
Adds text for CMD to the cloning message
2017-03-24 15:21:47 -05:00
Anewbe
2a4948e931
Merge pull request #3128 from Cerebulon/missing_hand_sprites
...
Adds in-hand sprites to several items.
2017-03-24 14:51:00 -05:00
Anewbe
731beb170f
Merge pull request #3123 from Leshana/job-controller-setloc
...
Fix mob.loc = X on spawn
2017-03-23 17:56:27 -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
5c51fcfa60
Fixes HI cost
2017-03-23 15:32:05 -05:00
Anewbe
a80ea977d1
Adds Boxcutters
2017-03-23 15:27:48 -05:00
Leshana
32437f2418
Fix mob.loc = X on spawn
...
* When spawning into the game (both latejoin and normal join) the job controller used loc = X to set location. This meant that Enter() was never called for entering the spawn location, and all other associated problems.
* This screws up the new jukebox music system because mob.lastarea is not set correctly.
* Fixed signpost teleporting for the same reason (nobody wants beach tunes playing forever)
2017-03-22 23:05:44 -04:00
MagmaRam
e3a87c1c78
Merge pull request #2985 from Anewbe/more_pdas
...
Adds rugged style PDAs
2017-03-22 19:42:19 -05:00
MagmaRam
d603394226
Merge pull request #3121 from Anewbe/borg_zap
...
Borg stun arm should work now
2017-03-22 19:42:01 -05:00
Anewbe
980c982996
Fixes the conflicts in the original branch
2017-03-22 17:51:04 -05:00
Arokha Sieyes
fbb73e1ed8
Merge branch 'master' into robot
2017-03-22 18:45:25 -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
Anewbe
538f91c202
Borg stun arm should work now.
2017-03-22 17:06:16 -05:00
Anewbe
38598f3aae
Merge pull request #3118 from Neerti/3/6/2017_surface_map
...
Continues work on the surface map
2017-03-22 16:33:40 -05:00
Arokha Sieyes
be36363a23
Ports several Paradise sound emotes ( #3039 )
...
* Ports several Paradise sound emotes
* Comment out scream MORE.
* Remove goonsounds, references
2017-03-22 16:11:55 -05:00
Arokha Sieyes
ae68468861
Allow AI to use custom holograms ( #3114 )
...
* Compound icon generator proc
Why didn't this exist before? Am I missing something? I need manipulatable icons of existing atoms including their overlays. Is there some easier way to get them than this...?
* Polaris Portion of AI Upgrade
2017-03-22 16:09:04 -05:00
Arokha Sieyes
9660186dfd
Not So Simple Animals ( #3103 )
...
* Merge two not-really conflicts
Thanks git, that whitespace conflict was super important?
* DME merge
* Added defines for mobs used by simple animals.
* Lost a slime along the way
* Disable debug settings
* HONK!!!
* Remove redundant hostile decls
* Replace loc= with forceMove in old SA code
I guess I should think of the children.
2017-03-22 14:30:07 -05:00
Anewbe
68a335b0c5
Xeno race tweaks
2017-03-21 23:31:10 -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
Anewbe
560af2d61d
Merge pull request #3116 from VOREStation/spawn
...
Makes the 'Spawn Character' verb include custom items
2017-03-21 18:38:23 -05:00
Anewbe
f16c6e22a7
Merge pull request #3115 from Atermonera/Emotes_don't_autohiss
...
Emotes, sign language, and EAL no longer activate autohiss
2017-03-21 18:38:04 -05:00
Neerti
b571ed9c66
Continues work on the surface map
2017-03-21 16:11:13 -04:00
Arokha Sieyes
e6098840ec
Fix runtime while eating
...
Don't divide by zero. If it has no flavors, this stays 0, then you try to divide by it.
2017-03-21 13:08:08 -04:00
Arokha Sieyes
17bd2d341a
Makes the 'Spawn Character' verb include custom items
...
Only really works if you pick the option to put them in the mob, because the proc that spawns custom items is based on that, and I don't really want to rework the custom items system for such a small fix.
2017-03-21 09:48:55 -04:00
Atermonera
78c1b51f81
Languages with NO_STUTTER won't use autohiss anymore
2017-03-21 00:13:33 -07:00
Neerti
7d1245d180
Merge pull request #3113 from Anewbe/easy_communicators
...
Communicator QoL
2017-03-21 02:17:27 -04:00
Anewbe
c65588b099
Communicator QoL
2017-03-21 00:51:26 -05:00
Anewbe
f796914849
Fixes a thing with jetpacks
2017-03-21 00:27:31 -05: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
9559b6e7cc
Merge pull request #3111 from Leshana/singulo-fixes
...
Fix signularity_pull leaving ghost item in your inventory slot
2017-03-20 22:33:43 -05:00
Anewbe
04c4b14e4b
Merge pull request #3110 from Leshana/jukebox-wires
...
Make jukebox controllable by its wires
2017-03-20 20:38:56 -05:00
Leshana
3a4bc3d897
Fix signularity_pull leaving ghost item in your inventory slot
...
* It called u_equip() Nothing should call u_equip(), bad!
* Also replaced magic numbers with defined constants while I was checking singularity code.
2017-03-20 21:31:52 -04:00
Anewbe
4779baf872
Spelling
2017-03-20 20:14:48 -05:00
Anewbe
beaadfa4cc
Merge pull request #3092 from Anewbe/vox_fix
...
Might fix Vox blindness
2017-03-20 19:48:29 -05:00
Anewbe
ba321a3e5e
Merge pull request #3109 from VOREStation/decals
...
Flooring decals should work more places
2017-03-20 19:32:10 -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
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
Arokha Sieyes
c8e26b365a
Flooring decals should work more places
...
Such as shuttles. A good example is the trader ship which has hazard stripes mapped in, which don't appear in the game because it doesn't work there.
2017-03-20 00:51:17 -04:00
Anewbe
e2b3f0b9c1
Merge pull request #3106 from Leshana/vplk-thrown-objects-hit-windows
...
Fix thrown objects hitting windows not in their path
2017-03-19 21:38:22 -05:00
Anewbe
59a4f62668
Merge pull request #3078 from Leshana/vplk-atmos-leak
...
New Event: Atmos Leak
2017-03-19 20:22:42 -05:00
Atermonera
2d2763fdb0
Merge pull request #2 from PolarisSS13/master
...
There should probably be a way to do this automagically
2017-03-19 17:09:02 -07:00
Atermonera
530593508a
Gives surgeonborgs the full medical hud, because why don't they already have it?
2017-03-19 16:58:53 -07:00
Anewbe
b5866d5876
Merge pull request #3088 from Leshana/huhbots
...
Ports Bot Patrolling back to Polaris (Plus bot fixes)
2017-03-19 16:09:32 -05:00
Leshana
ef52ccbe4d
Fix thrown objects hitting windows not in their path
...
* Fixes windows counting as blocking the entire tile for thrown objects when they don't.
* Same thing for windoors, which have the same problem.
2017-03-19 17:06:38 -04:00
Neerti
24b50fe2e6
Merge pull request #3098 from Leshana/mob-controller-runtime
...
Fix runtimes in controllers
2017-03-18 22:27:13 -04:00
Neerti
80c29e6213
Merge pull request #3102 from VOREStation/ventweld
...
Fixes ventcrawl
2017-03-18 21:27:41 -04:00
Arokha Sieyes
5425a06bc8
Fixes ventcrawl
...
Fixes #1202
2017-03-18 19:30:54 -04:00
