cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 04:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,574 Commits 9 Branches 26 Tags
v0.1.13
Commit Graph
1438 Commits
Author SHA1 Message Date
DJSnapshot ec238be981 Revert and fix for e-nets. 2014-07-25 16:23:26 -07:00
DJSnapshot 75c1a4bac3 Disabling E-nets after admin discussion. 2014-07-23 21:26:12 -07:00
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
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
Chinsky e304d0010d Merge pull request #5273 from boopcat/happydrones 
fixes!
 2014-06-17 14:43:55 +04: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 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
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 9339b1235b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-06-11 09:14:13 +09:30
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 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
Zuhayr dfa6d8ef15 Merge branch 'shuttlecontroller' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-04 19:14:00 +09:30
Jeremy Liberman bc1628378d Rephrase text based on code review 2014-06-03 21:51:21 -05:00
Jeremy Liberman 2a6e6bb021 Merge branch 'dev' into mutiny 2014-06-03 21:27:42 -05:00
Jeremy Liberman dc67453796 Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel. 2014-06-03 21:26:34 -05:00
Zuhayr 7a56a174dc Converted Syndicate shuttle over to multi-shuttle setup. 2014-06-04 00:08:10 +09:30
Zuhayr 54b08ff55a Moved the Vox skipjack console over to a multi-destination shuttle datum setup. 2014-06-03 23:21:10 +09:30
Chinsky a086043a9b Merge pull request #5116 from mwerezak/round-end 
Round no longer ends suddenly
 2014-06-02 23:00:48 +04:00
Zuhayr 1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
mwerezak e91f285ce9 Adds cleanup for heist mode 2014-06-01 17:01:35 -04:00
mwerezak cc4a6e0f26 Fixes config.continous_rounds and adds check 2014-06-01 15:49:13 -04:00
mwerezak dbe43db59a Round no longer ends suddenly 
Instead, a crew transfer vote is called. Also adds cleanup proc to
game_mode.
 2014-06-01 14:50:57 -04:00