cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 17:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,943 Commits 2 Branches 1 Tag
ecd7df9628a7cd15662965b9482cfccebb5d94e4
Commit Graph

1458 Commits

Author SHA1 Message Date
Zuhayr
ad8ef7c4ab Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-28 20:59:29 +09:30
Zuhayr
11a2b0eb3c Merge pull request #5792 from Whitellama/flavourtext 
Dynamic Flavour Text
 2014-07-28 10:11:02 +09:30
PsiOmega
fc5d33917b Attempts to ensure that the captain (or the head loyalist to be precise, whomever he might be) is not a candidate for the directives. 2014-07-27 23:32:36 +02:00
Whitellama
8f1417f14c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext 2014-07-26 17:09:12 -07:00
Whitellama
bbc9150793 Updated body_parts_covered 2014-07-26 17:06:08 -07:00
Zuhayr
bc25cca7a9 Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics 2014-07-26 15:45:26 +09:30
Zuhayr
efe1c2feb2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:39:25 +09:30
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/client/preferences.dm
 2014-07-25 17:19:59 -07:00
DJSnapshot
ec238be981 Revert and fix for e-nets. 2014-07-25 16:23:26 -07:00
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
DJSnapshot
75c1a4bac3 Disabling E-nets after admin discussion. 2014-07-23 21:26:12 -07:00
Mloc-Argent
d5e9851b62 integrate XGM into the code 
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-07-22 19:52:12 +01:00
Zuhayr
60d9d3d5e6 Merge resolution. 2014-07-21 16:34:38 +09:30
Zuhayr
ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
Whitellama
266d8d25fa Fixed #5685: Changelings now gain the species needed to transform when acquiring DNA using the extract DNA sting 2014-07-19 19:11:30 -07:00
mwerezak
1a52aa7b06 Merge remote-tracking branch 'upstream/dev' into op-hideout 2014-07-16 17:41:30 -04:00
Hubblenaut
4ee6b77289 Adds new syndicate closet and adjusts nuke setup 2014-07-15 17:22:03 +02:00
Hubblenaut
fbd8d48532 Rigs spawn in backpack, uplink spawns without locker, code spawns at special spawnpoint 2014-07-15 17:21:52 +02:00
Decius
203c36114d Made spawning with a loyalty implant compliant to configuration... 
Created a proc for being implanted with loyalty implant which
checks for the configuration for whether or not it will work. If it is
enabled, it continues on-- if it is disabled, it returns from the proc.

Also made secure closets not automatically spawn them unless the config
is set to allow it.

Admin 'loyalty implanting' via the panel is now compliant to the
configuration file. If preferred, I am willing to make an override variable
to the proc that will allow admins to do it anyway.

Supply pack for it commented out due to inability to make it conform.
Easy enough to re-add back for anyone downstream if they wish it. Same
applies to the design.


Signed-off-by: Decius <deciusreln97@gmail.com>
 2014-07-14 17:21:11 -04:00
Zuhayr
326f3821e1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-09 15:52:31 +09:30
Decius-R
b6c61b5293 Updated rune.dm to switch some options in an alert 
As per requested.
 2014-07-07 22:38:33 -04:00
Decius
021c48ea02 Added in damage towards people being converted by cult, and fixed a typo... 
People who are being converted by the cult now take 10 damage in the first
place. Additionally, those who resist take a little bit more damage and get
a fair number of messages showing their great painful resisting and whatnot.

Light and fun.

Signed-off-by: Decius <deciusreln97@gmail.com>
 2014-07-07 22:23:20 -04:00
Walter0o
68ad7c7373 fixes another heist mode breaking bug 
vox can never win their inviolate_crew objective due to not having cortical stacks put in them on setup.
i took this code from one_click_antag's create_vox_raider() and edited it slightly.
i was thinking about merging the two procs into one but i will leave that for you to decide.
 2014-07-06 03:32:21 +02:00
mwerezak
1aeb094a79 Fixes Heist ending immediately 2014-07-04 19:06:55 -04:00
Zuhayr
4b06cf82f0 Fixes #5491 2014-07-04 17:34:30 +09:30
Zuhayr
8b65aa727b Missed a linebreak. 2014-07-02 07:23:59 +09:30
Zuhayr
4f73f7a834 Cleans up some of the lore issues with Mutiny. 2014-07-02 07:22:33 +09:30
Zuhayr
65c0dc2e64 Changed Mutiny messages to use the existing Centcomm message format. 2014-07-02 07:14:35 +09:30
Zuhayr
ef5387fece Fixes #5113 2014-07-01 01:04:50 +09:30
Chinsky
b9a2d2a1f5 Merge pull request #5366 from alex-gh/mutiny_runtime_fix 
Fixes multiple runtimes in mutiny mode.
 2014-06-27 01:12:46 +04:00
alex-gh
8810d3db71 Fixes multiple runtimes in mutiny mode. 
Example runtime:

runtime error: Cannot read null.assigned_role
proc name: get crew to terminate (/datum/directive/terminations/financial_crisis/get_crew_to_terminate)
  source file: financial_crisis_directive.dm,11
  usr: null
  src: /datum/directive/terminations/... (/datum/directive/terminations/financial_crisis)
  call stack:
/datum/directive/terminations/... (/datum/directive/terminations/financial_crisis): get crew to terminate()
/datum/directive/terminations/... (/datum/directive/terminations/financial_crisis): meets prerequisites()
mutiny (/datum/game_mode/mutiny): get directive candidates()
mutiny (/datum/game_mode/mutiny): pre setup()
/datum/controller/gameticker (/datum/controller/gameticker): setup()
/datum/controller/gameticker (/datum/controller/gameticker): pregame()
/datum/controller/game_control... (/datum/controller/game_controller): setup()
 2014-06-26 00:43:53 +02:00
mwerezak
abcba2c725 Merge remote-tracking branch 'upstream/dev' into emergency-shuttle 2014-06-24 17:49:20 -04:00
DJSnapshot
f2db8ed909 Merge pull request #5344 from Hubblenaut/dev 
Moves the non-implanted security positions from restricted to protected ...
 2014-06-23 21:22:59 -07:00
mwerezak
25bcdfa39e Merge remote-tracking branch 'upstream/dev' into emergency-shuttle 
Conflicts:
	code/setup.dm
 2014-06-24 00:09:17 -04:00
mwerezak
9e0562b16c Adds shuttle controller 
Moves all ferry shuttle processing into one place: the new shuttle
controller.

Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
 2014-06-23 22:00:57 -04:00
Hubblenaut
4868c7337c Moves the non-implanted security positions from restricted to protected list, adds IA Agent to restricted. 2014-06-24 00:12:58 +02:00
Mloc-Argent
a33cb7272b Merge remote-tracking branch 'upstream/master' into dev 2014-06-23 20:57:47 +01:00
Zuhayr
a6f64ccd9c Merge pull request #5330 from mwerezak/emergency-shuttle 
Updates emergency shuttle controller to use shuttle datums
 2014-06-23 21:19:36 +09:30
mwerezak
dc304026a9 shuttle_controller now uses a shuttle datum 2014-06-22 18:10:56 -04:00
Chinsky
7e56df8689 Merge pull request #5308 from mwerezak/wound-infections 
Re-enables infections, implements a wound infection system, improves body temperatures
 2014-06-22 22:04:25 +04:00
mwerezak
37e63dfcb0 Fixes FEA temperature_expose() being used... 
...instead of ZAS fire_act().
 2014-06-22 00:13:22 -04:00
mwerezak
b9fa433087 Adds suit cooling device 
Also:

Breathing in hot/cold air will affect your body temperature.
Fixes old body temperature stabilization code not working.
Thermometer icon now adjusts based on species.
Reduced BODYTEMP_AUTORECOVERY_MINIMUM to a less ridiculous value.
 2014-06-21 16:53:18 -04:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
 2014-06-20 22:02:40 +01:00
mwerezak
cd971fb4ea Fixes a missing config check in autotraitor 
Also adds a config check to the various forge_* procs just to be sure.
 2014-06-19 00:01:47 -04:00
mwerezak
e46c3c8834 Renames supply controller global var 
Renamed from 'supply_shuttle' to 'supply_controller'
 2014-06-18 19:37:46 -04:00
Zuhayr
342bee81d4 Merge pull request #5284 from boopcat/happydrones 
more fixes!
 2014-06-18 08:58:00 +09:30
Boop
8cc14a2ac3 Fixed #4697 while still trying to make it work 
a bit messy but I don't know a better way to do this
 2014-06-17 17:40:29 +01:00
Boop
d2e81da90c Fixes #4756 
removes the getrev stuff because it's svn and old and I couldn't get tg's stuff to work :c
 2014-06-17 17:25:57 +01: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