cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 10:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,179 Commits 2 Branches 1 Tag
3a31c88f4327edb95f1386715ee354b7c05ff8a9
Commit Graph

24722 Commits

Author SHA1 Message Date
Yoshax
3a31c88f43 Fixes sliceable food and slices 2017-03-10 19:49:15 +00:00
Yoshax
6f12826c45 Adds ability to add food to the chem master because the condimaster is beyond broken 2017-03-10 17:00:31 +00:00
Yoshax
26d56e2cf4 Fixes/adds reagent transferring to/from food 2017-03-10 16:39:57 +00: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
59a75f37a2 Merge pull request #3026 from Yoshax/ghoststuff 
Cleans up, fixes, and improves ghost teleporting
 2017-03-08 10:58:36 -06:00
Anewbe
9141314d60 Merge pull request #3060 from nachomeep/sounds 
Enables photocopier sounds
 2017-03-08 10:53:09 -06:00
Anewbe
96d94410df Merge pull request #3048 from nachomeep/gas 
Makes phoron very purple.
 2017-03-08 10:52:53 -06:00
nachomeep
a53b196e13 missed a line 2017-03-08 08:05:41 -05:00
nachomeep
59a592fd34 minor delay adjustment 2017-03-07 16:13:19 -05:00
nachomeep
eaba140555 adds delay to sounds 2017-03-07 16:11:38 -05:00
nachomeep
72d54925d5 enables photocopier sounds 2017-03-07 15:16:57 -05:00
Neerti
04e38f8e26 Merge pull request #3059 from Anewbe/custom_item_check 
Adds a check for custom items
 2017-03-06 22:43:49 -05:00
Anewbe
44cd464941 Adds a check for custom items 2017-03-06 21:25:54 -06:00
Leshana
a5a805414b Fixed paths references to obsolete path /obj/item/clothing/shoes/combat 
* It was changed in most places to /obj/item/clothing/shoes/boots/combat but some were not.  The changling subtype prevented any compile errors.
 2017-03-06 21:58:39 -05:00
Neerti
9b13c7367c Merge pull request #3057 from Anewbe/tails 
Edits Taj and Unathi tail sprites
 2017-03-06 19:02:58 -05:00
Neerti
fc75357c61 Merge pull request #3054 from Anewbe/healthscanner 
Oxyloss shows as cyan
 2017-03-06 18:59:27 -05:00
nachomeep
afcd662beb turns all phoron purple 2017-03-06 17:54:40 -05:00
Anewbe
132d9a7611 Edits Taj and Unathi tail sprites 2017-03-06 14:41:06 -06:00
Anewbe
079a5e787e Merge pull request #3056 from Leshana/supply-shuttle-hook 
Adds Supply Shuttle Hook
 2017-03-06 13:55:25 -06:00
Anewbe
13d161565e Merge pull request #3055 from VOREStation/missinghud 
Add TOTAL_HUDS define
 2017-03-06 13:51:01 -06:00
Leshana
8355428e4e Adds Supply Shuttle Hook 
* Adds a global hook for when the supply shuttle reaches centcom.  The existing sell_crate hook is too limited, as it only detects what is in crates, and is fired many times, making it hard to produce a summary for events that might want stuff shipped on the shuttle.
 2017-03-06 12:36:19 -05:00
Arokha Sieyes
e65ef1b0d6 Add TOTAL_HUDS define 
Making a list just... 'be 10 long' is bad. Like update_icons layers and various other things, if you add more, it will compile fine and then you get runtimes later, which is a little annoying. Having places you just have to 'know' to update elsewhere in the code is meh.
 2017-03-06 01:07:46 -05:00
Yoshax
45af122441 forcemove 2017-03-05 23:58:17 +00:00
Anewbe
b4ec8eb026 Oxyloss shows as cyan 2017-03-05 14:19:51 -06:00
Anewbe
d68292b236 Merge pull request #3002 from Anewbe/plant_things 
Space Vines are more dangerous
 2017-03-05 14:15:13 -06: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
Anewbe
e2a9b64174 Merge pull request #3043 from Leshana/blueprints 
Extend Station Blueprints to consider outdoor mining areas as "space"
 2017-03-05 14:11:45 -06:00
Anewbe
36f80e9eda Merge pull request #3046 from Neerti/3/4/2017_turbolift 
Ports Turbolifts from Bay.
 2017-03-05 14:11:15 -06:00
Anewbe
26399c0e43 Merge pull request #3044 from VOREStation/cryo 
Make cryo recursively remove mobs
 2017-03-05 14:09:30 -06:00
Yoshax
eeed8496cf Fixes the paperwork date insert 2017-03-05 03:10:11 +00:00
Neerti
411bd2b05b Ports Turbolifts from Bay. 2017-03-04 21:35:00 -05:00
Anewbe
3f9d6d8b50 Merge pull request #3042 from Leshana/fix-mapload-runtimes 
Fix server startup runtimes from uninitaizlied var
 2017-03-04 15:38:00 -06:00
Anewbe
283071d9db Merge pull request #3035 from Neerti/3/2/2017_example_map 
Adds Multi-Z Test Map
 2017-03-04 15:26:49 -06:00
Arokha Sieyes
4533150c67 Make cryo recursively remove mobs 
So if a mob is being held, like a Teshari, or anything else ~~like being eaten cough~~ then they are handled correctly by cryopods. Otherwise if someone scoops a Teshari, and cryos, they are simply deleted, their records stay in the round, their job slot is occupied indefinitely, etc.
 2017-03-04 01:39:42 -05: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
Leshana
8a48bb0ece Fix server startup runtimes from uninitaizlied using_map 
* That if statement wasn't heping anyone as it was.
* Strangely however, even an `if(using_map)` doesn't help, as using_map is in some crazy BYOND limbo state at that point in world init.  but checking istype() succeeds in figuring out its not real.
 2017-03-03 19:52:26 -05:00
Anewbe
c831df104b Merge pull request #3041 from PolarisSS13/revert-3018-master 
Revert "BlockHeadHair doesn't make players bald."
 2017-03-03 18:29:46 -06:00
Anewbe
facd055d07 Merge pull request #3037 from VOREStation/traybuckle 
Fix two extra robust bugs
 2017-03-03 18:23:25 -06:00
Anewbe
01109d3b8d Fixes the slowdown bug 2017-03-03 17:38:55 -06:00
Anewbe
81549fc965 Revert "BlockHeadHair doesn't make players bald." 2017-03-03 17:19:07 -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
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
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
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
acf30da072 Merge pull request #3033 from VOREStation/surgidesc 
Fixes descriptions on 3 surgical tools
 2017-03-02 15:23:27 -06:00