Commit Graph

25813 Commits

Author SHA1 Message Date
Kelshark
081e280e27 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/global.dm
#	config/custom_items.txt
#	icons/mob/human_races/r_xenochimera.dmi
#	vorestation.dme
2017-03-03 19:17:04 -05:00
Kelshark
b5d239c42f Interserver shipping update and other changes 2017-03-03 19:13:06 -05:00
Kelshark
fd626b4d70 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2017-03-03 19:10:18 -05:00
Arokha Sieyes
fe641793cb Merge pull request #1075 from VOREStation/blueprints
Extend Station Blueprints to consider outdoor mining areas as "space"
2017-03-03 18:53:05 -05:00
Leshana
8ede18c3ba 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 18:26:51 -05:00
Arokha Sieyes
79805c8cbe Adds *mlem and *awoo
YOU. MAKE. ME. ***SICK.***

That you somehow convinced me to do this.
2017-03-03 18:19:39 -05:00
Arokha Sieyes
3a8051b142 Merge pull request #1073 from VOREStation/aro-traybuckle
Fix two extra robust bugs
2017-03-03 16:43:36 -05:00
Arokha Sieyes
c4b25d6cf6 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:13 -05:00
Arokha Sieyes
4c3504365b Merge pull request #1071 from VOREStation/aro-softproblems
Redo Vore Panel Interactions
2017-03-03 14:48:05 -05:00
Arokha Sieyes
97ca5c2542 Merge pull request #1062 from VOREStation/aro-030217sync
Polaris Sync
2017-03-03 14:29:40 -05:00
Arokha Sieyes
171ee67d99 Merge pull request #1068 from Screemonster/xenoiconandferal
more xenochimera tweaks
2017-03-03 14:28:10 -05:00
Arokha Sieyes
809110eda1 Merge pull request #1065 from JoanRisu/Fluff_Items_worshop
Fluff items worshop.....15???
2017-03-03 14:26:43 -05:00
Arokha Sieyes
3986b40007 One more small tweak for prey in bellies
Can't touch items that have already left
2017-03-03 14:23:33 -05:00
Arokha Sieyes
fcd57c1131 Redo Vore Panel Interactions
- Redid belly interactions into a hide-able section to keep it nice and clean.
- Changed most 'error' messages into modal alert boxes to make it obvious.
- Remade name/desc/bellycount rules into defines at the start of the file.
- Fixed transfer problems as far as I can tell (Fixes #1063 Fixes #763)
- Can't delete transfer location bellies. Notifies you what points at it and tells you to change it first.
- Get rid of the -1% thing. Just set it to 0% if you don't want it to happen.
- Added a little '?' help button for general interaction info.

https://gyazo.com/b8fb247c0ac101753795a400d61240d0
2017-03-03 14:20:37 -05:00
Screemonster
26cb63f7fc preview icon for xenochimera, fixes feral in stasis, raises shock threshold 2017-03-03 16:01:17 +00:00
JoanRisu
3785bd3700 ~Changes flag for squirrelkin language
~changes Joan's bag and its icon
+Adds Dhael's gun and permit to her spawnlist
~debug attempt on Crescent Rose's sprite changing code. Also changes sprites.
2017-03-03 03:39:00 -08:00
Screemonster
89a0559077 Add's vinjj's fancy bandana 2017-03-03 11:33:02 +00:00
JoanRisu
7653763fc4 Merge pull request #1059 from Poojawa/trekuniforms
trek uniforms + loadout listing
2017-03-03 01:05:53 -08:00
Poojawa
7891bf2b52 Trek Uniforms 2017-03-03 02:51:05 -06:00
JoanRisu
ceca64804d Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-03-02 23:28:45 -08:00
JoanRisu
3f26a1d223 Some personal changes to my items and adds a dune buggy for science expeditions. 2017-03-02 23:17:04 -08:00
Arokha Sieyes
513e7c0e57 Comment out noisy message 2017-03-03 00:43:35 -05:00
Arokha Sieyes
8ad568ae18 Merge pull request #1060 from VOREStation/aro-aivore
Adds AI Vore Capability
2017-03-03 00:27:06 -05:00
Arokha Sieyes
ee25004483 More map stuff. 2017-03-03 00:19:15 -05:00
Arokha Sieyes
a3e5e7327f Initial commit of new map system for Virgo 2017-03-02 23:34:43 -05:00
Arokha Sieyes
8749e2bc02 Fix custom ear sprite code 2017-03-02 22:50:59 -05:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Spades
7b194cf09c Fixes broken dead alien icons 2017-03-02 22:04:39 -05:00
Arokha Sieyes
c5c0af4f2f Adds AI Vore Capability
Also just general AI QOL things.

AIs have a "Hardlight Noms" verb in the Vore tab. When their hologram is on top of a person, they can pick this, and will homf them. Takes 5 seconds, neither of you can move or it cancels. Holograms with someone inside become almost opaque and purple. They also have different examine text.

A hologram with someone inside cannot move through glass/tables/etc. Pressing "Hardlight Noms" again will give the option of dumping the prey out. Derezzing the hologram will also do this. Also because the hologram can be 'blocked' by things now when full, moving the hologram off the screen will derez it and dump the prey too.

AIs can examine mobs now to get flavortext and OOC notes. Shift-click only. This is for annoying technical reasons. Sorry to those that like to right-click and click examine.
2017-03-02 21:54:19 -05:00
Anewbe
a0198fb947 Merge pull request #3022 from VOREStation/infections
Infection code improvement
2017-03-02 19:54:26 -06:00
Anewbe
9ca2d1223e Merge pull request #3031 from Dankman/master
Fixing issues with the Xenobiology Computer.
2017-03-02 17:51:48 -06:00
Anewbe
a45ef074bd Merge pull request #3029 from VOREStation/blood
Make blood loss/heart removal make sense
2017-03-02 17:03:44 -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
acf30da072 Merge pull request #3033 from VOREStation/surgidesc
Fixes descriptions on 3 surgical tools
2017-03-02 15:23:27 -06:00
Arokha Sieyes
520812ffb7 Merge pull request #1057 from Yoshax/loadout_stuff
Colorable loadout items
2017-03-02 16:09:13 -05:00
Poojawa
1375db16bc fixes typos 2017-03-02 15:06:48 -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
Poojawa
c062a0cfe1 trek uniforms + loadout listing 2017-03-02 12:00:19 -06:00
Yoshax
94294f0a3f Colorable loadout items 2017-03-02 12:56:09 +00:00
Arokha Sieyes
8e09140669 Merge pull request #1051 from VOREStation/aro-spacechatter
Space Chatter
2017-03-02 00:44:44 -05:00
Arokha Sieyes
172fc03254 Merge pull request #1052 from VOREStation/parts-lathe
Parts Lathe - Phase 1
2017-03-02 00:43:20 -05:00
Dhaeleena
7712aabda9 Permit for cat gun 2017-03-01 19:58:33 -03:00
Leshana
3900225f53 Fix custom items appearing in random space turfs
* If a custom item can't be equipped to a character's inventory it is dropped on the ground.  For late join characters, equip_custom_item() was called before the mob was placed at their starting locations; their coordinates were still 1,1,1.   Which is the edge of a map so they get bounced to another z level.
* Fix: Equip custom items AFTER job_master.LateSpawn places the mob at the starting location, so it flows in same order as roundstart join characters.
2017-03-01 17:51:32 -05:00
Leshana
12957f703b Added the Parts Lathe!
* The parts lathe can print tech level 1 stock parts (matter bins, capacitors) required to build basic unupgraded machines.
* This is a separate machine from the autolathe to ease any concern that the autolathe would become OP.
* ALSO, it can be hit with a circuit board and will conveniently display the parts required to build that board's machine.
* Added circuitboard and design for constructing a parts lathe.
2017-03-01 17:16:16 -05:00
Dankman
028d7a0ec6 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' 2017-03-01 17:00:29 -05:00
Dankman
a2e09a2f10 Fixing one slight issue.
I'm an idiot, forgot about garbage collecting. This fixes a slight issue
in my previous PR that would have eventually resulted in a call of DEL
if nobody rebuilt the console.
2017-03-01 16:59:13 -05:00
Arokha Sieyes
0ff31bd69f Merge pull request #1050 from VOREStation/upgradable-machines
Makes resleever upgradable
2017-03-01 16:31:59 -05:00
Arokha Sieyes
50cb707e92 Merge pull request #1047 from VOREStation/aro-backuphud
Backup implant HUD icon
2017-03-01 16:31:45 -05:00
Dankman
60002d04cc Fixing runtimes, making things functional for the Xenobiology Console
The old build path pointed towards a circuitboard instead of towards the
machine, meaning when you screwdrivered the frame twice, it would cause
frame.dm to runtime, and then not delete the frame, meaning you could
spam click the console with a screwdriver and spawn infinite boards, and
still be stuck with a non functional machine.

injector.computer = null was causing a runtime because it was attempting
to edit something that no longer existed on destruction.
2017-03-01 16:26:42 -05:00
Anewbe
8af4c2ba46 Merge pull request #3024 from Cameron653/master
Prevents halloss showing up as actual wounds on self examine
2017-03-01 15:03:44 -06:00