cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-30 20:13:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,836 Commits 2 Branches 1 Tag
0e1c367012473ade78b5fed37c7c5a8f7898df2c
Commit Graph

7120 Commits

Author SHA1 Message Date
Cael Aislinn
6c46ceaf6d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology 
Conflicts:
	icons/obj/hydroponics.dmi

manual merge of conflicted icon file

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 10:05:27 +10:00
Chinsky
be95e54e43 Merge branch 'master' into dev 
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-06-17 16:16:44 +04:00
Chinsky
08dd01801e Merge pull request #5266 from mwerezak/firelock-fix 
Proposes a fix for #5224
 2014-06-17 14:58:33 +04:00
Chinsky
e304d0010d Merge pull request #5273 from boopcat/happydrones 
fixes!
 2014-06-17 14:43:55 +04:00
Chinsky
dd4a937ca9 Merge pull request #5275 from GinjaNinja32/lighters 
Fixes cheap lighters burning body parts other than the hands they're being held in
 2014-06-17 14:43:24 +04:00
Chinsky
1ca6a54d3a Merge pull request #5265 from mwerezak/wound-fixes 
Fixes the wounding system
 2014-06-17 14:41:22 +04:00
GinjaNinja32
fcdd0198c0 Fix lighter burning random body parts 2014-06-17 04:50:14 +01:00
Boop
07a6ad4897 Fixes #5270 
Changes simple_animal/Die() to use death from mob/living instead.
 2014-06-16 23:30:37 +01:00
mwerezak
9f7e7004a3 Breach detection update 
Now only triggers for abnormally low pressures.

Allows breach detection to trigger if an alarm was already raised in an
area for a different reason.
 2014-06-16 13:47:04 -04:00
mwerezak
6dee9cf65d Adds sharp and edge flags to appropriate items 
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
 2014-06-16 13:26:44 -04:00
mwerezak
17aca7e84d Fixes #5224 2014-06-16 01:43:56 -04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
 2014-06-15 20:25:39 -04:00
mwerezak
4d12d263e9 Adds docking control to ERT shuttle 
Also adjusts the location of the centcom shuttle docking controller.
 2014-06-14 18:35:02 -04:00
mwerezak
d837e5d246 Streamlined docking code 
Server and client now have more consistent responsibilities.
Ferry shuttles will always be forced undocked when moved, even if moved
by admin magic.
 2014-06-14 15:51:26 -04:00
mwerezak
dc7d8fafe0 Adjusts how undocking signals are used 
Now both server and client will to undock concurrently. It looks much
more natural.
 2014-06-14 15:16:05 -04:00
mwerezak
232e50e415 Shuttle console refactoring 
Also adjusted the way undocking signals were used.
 2014-06-14 15:15:48 -04:00
mwerezak
acec01fb14 Docking overrides now have a clear purpose 
Originally the purpose of the docking override was to allow the shuttle
to move even if it couldn't undock properly (e.g. the doors were stuck
open), however it makes more sense just to have the shuttle take care of
that. This commit now makes the behaviour of the docking overrides line
up with it's new purpose.
 2014-06-14 15:15:30 -04:00
Chinsky
09420d9fba Merge pull request #5248 from Zuhayr/master 
Robot fixes.
 2014-06-14 23:05:46 +04:00
Chinsky
e935cc0947 Merge pull request #5250 from Kelenius/OfCultistsAndRunes 
Rune drawing update
 2014-06-14 19:04:35 +04:00
Kelenius
db882ba664 Rune drawing update 2014-06-14 13:57:23 +04:00
Zuhayr
5ad652e90c Fixes #5195 2014-06-14 18:48:13 +09:30
Zuhayr
80db3a284b Merge pull request #5216 from Loganbacca/trainmerge 
Cargo Trains
 2014-06-14 17:13:55 +09:30
Mloc-Argent
9896e44d8a Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/__HELPERS/unsorted.dm
 2014-06-12 18:56:26 +01:00
Chinsky
6d432d8e9d Merge pull request #5219 from Zuhayr/autolathe 
Autolathe rewrite.
 2014-06-12 20:28:44 +04:00
Zuhayr
0722775bda Merge pull request #5207 from mwerezak/get_turf_loc-cleanup 
Cleans up get_turf_loc()
 2014-06-12 18:13:01 +09:30
Chinsky
c56ab301d1 Compile fix for a fix for legcuffs. 2014-06-12 02:50:11 +04:00
Zuhayr
136ccc347b Merge with dev. 2014-06-12 01:14:40 +09:30
Chinsky
1f7a9355f8 Merge pull request #5212 from faerindel/hydro_refactor 
Hydroponics refactor, part 1: Files.
 2014-06-11 13:30:51 +04:00
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
Zuhayr
06154d4d8d Further work on autolathe. 2014-06-11 15:39:14 +09:30
Zuhayr
9aafac8ade Added multipliers to autolathe. 2014-06-11 15:06:46 +09:30
igalan
eee72ce802 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydro_refactor 2014-06-11 03:45:00 +01:00
igalan
7d08d4701c Hydroponics refactor, part 1: Files. 
No code actually modified, just moved from all over the place to a module folder.

defines/obj/hydro.dm split:
-Seeds into seeds.dm
-Tools like the analyzer, pest and weedkillers into hydro_tools.dm. Hatches and scythe from defines/obj/weapon.dm moved there too.
-Non-edible plants like nettles into grown_inedible.dm. Special procs in items/weapons/hydroponics.dm moved there.
-Biogenerator and hydroponics tray files moved.
 2014-06-11 03:44:29 +01:00
Zuhayr
c841db56b6 Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:24:28 +09:30
Zuhayr
5be9f0e12f Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:15:28 +09:30
Zuhayr
9339b1235b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-06-11 09:14:13 +09:30
Zuhayr
83aa460a98 Autolathe actually works now. 2014-06-11 09:12:35 +09:30
PsiOmega
6dd8e1e022 Fixes #5205. 
Creates a new area instance for the PDA messaging room in the AI zone.
 2014-06-10 20:32:16 +02:00
mwerezak
a8816823a5 Replaces get_turf_loc() with get_turf() 
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
 2014-06-10 13:43:11 -04:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
mwerezak
ed4fb8d3c6 Shuttles now dock on arrival and departure 
Squashes 3 commits:

Shuttles now dock on arrival and departure

Adds docking controller to outpost, tweaks

Finishes off shuttle_console
Could use some cleanup, though.
Commented out the debug stuff.
 2014-06-10 00:05:08 -04:00
mwerezak
b4bb8ab31d Reworks shuttles to be more extensible 
Kudos to Zuhayr for laying the groundwork for this.
 2014-06-09 23:41:29 -04:00
mwerezak
0319c96502 Adds docking support to shuttles, NanoUI 2014-06-09 23:41:08 -04:00
mwerezak
63ea6eba0d Adds docking controllers to shuttles 
Shuttles dock at round start.
 2014-06-09 23:37:37 -04:00
Mike
129ee988b4 Adds a docking controller to the research shuttle 
Squashes 3 commits:

Adds a controller for single door based docks

Adds a docking controller to the research shuttle

Adds override control to airlock dock nano-ui
 2014-06-09 23:29:03 -04:00
mwerezak
ad7a1c5d59 Adds docking controllers 
Squashed 10 commits:

Adds simple docking controllers

Adds docking_controllers.dm

Moves docking handshake code into its own type
Keeps docking code separate from the code for messing with airlocks and
doors.

Improves handling of invalid states

Adds docking controller to research shuttle dock

Also adds the start of a nano-ui template.

Resetting the dock controller resets the override

Adds debug verbs

Adds support for overriding docking checks

Less confusing name for the docking program
 2014-06-09 23:14:53 -04:00
mwerezak
3bc6f4c9b6 Generalizes embedded_controller/radio 2014-06-09 23:08:07 -04:00
mwerezak
32ba5903b4 Generalizes embedded program 2014-06-09 23:05:58 -04:00
mwerezak
0d95d0aad3 Implemented docking commands 
Squashed 4 commits.
 2014-06-09 23:05:38 -04:00
mwerezak
80590ea58b Initial commit 2014-06-09 23:05:17 -04:00