cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 09:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,984 Commits 74 Branches 23 Tags
6393cb15d8f10833e899bad30812180424931b3d
Commit Graph

1421 Commits

Author SHA1 Message Date
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
Hubblenaut
eb23c44c8a Removes explosive implants from nuke ops 2014-06-01 20:15:39 +02:00
Zuhayr
825a77b702 Fixes end of round drone spam. 2014-05-31 15:38:10 +09:30
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev" 
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
 2014-05-31 00:25:56 +01:00
Ccomp5950
4bb59352f5 Merge pull request #4968 from MrLeebo/mutiny 
Mutiny Mode
 2014-05-28 00:13:42 -05:00
Chinsky
4594e2bf1b Merge pull request #5071 from Ravensdale/dev 
Updates most used viable entries of Tau Ceti to Nyx
 2014-05-27 21:46:43 +04:00
Ravensdale
abdadd35b4 Updates most used viable entries of t cet to Nyx 2014-05-26 15:58:16 -07:00
Zuhayr
4538fbabca Lots of work on hardsuits, commented out some broken WIP code, did some renaming, deleted now-redundant species-specific hardsuits. 2014-05-27 01:18:07 +09:30
Jeremy Liberman
aefb1cbc05 Secret Mutiny Mode backstory easter egg 2014-05-26 01:00:33 -05:00
Jeremy Liberman
d3541d1e08 Merge branch 'dev' into mutiny 2014-05-25 14:22:16 -05:00
Jeremy Liberman
c607872b80 Mutiny fix prereqs for directives 2014-05-25 14:20:37 -05:00
Hubblenaut
e28ce8a366 Removed all prefixes of type 'paper - ' 2014-05-23 22:31:27 +02:00
Jeremy Liberman
a95a28e303 Merge branch 'dev' into mutiny-fixes 2014-05-18 11:25:36 -05:00
Jeremy Liberman
5f025b630a Mutiny fixes; add sanity checks, prevent recruitment spam, fix pinpointer description, fix overlays when changing teams, and convert indents to tabs 2014-05-18 11:05:04 -05:00
Loganbacca
7d75f6432d Fixed doubled construct spells 
Constructs were being assigned duplicated spell lists when spawned from soulstones
 2014-05-18 19:52:03 +12:00
jack-fractal
1bd866239f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage 
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/doors/door.dm
 2014-05-13 20:45:05 -04:00
Jeremy Liberman
d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05:00
Mloc-Argent
a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00