cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 00:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,875 Commits 74 Branches 23 Tags
afd526126d8f4d4e36a42b51fa9cfbc6bea18f14
Commit Graph

1058 Commits

Author SHA1 Message Date
SkyMarshal
772c320303 Multi-Z. 2015-08-30 14:15:20 -07:00
PsiOmega
35ea424edc Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-08-29 10:06:18 +02:00
PsiOmegaDelta
bf3040cc2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-27 09:01:50 +02:00
PsiOmegaDelta
d293b9ea25 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-08-27 08:53:22 +02:00
mwerezak
7c96829ecd Fixes #10828 
Adds a slick red emergency light to the engineering escape pod, updates other pods to match.
 2015-08-23 18:19:22 -04:00
PsiOmega
d001489d14 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-21 18:59:19 +02:00
Kelenius
c074f9ee9e Fixes a runtime with lights during explosions 2015-08-21 13:01:35 +03:00
PsiOmegaDelta
921015d6f3 Fixes computers with custom icon states. 
It broke the overlay system. Also makes the power monitoring computer use the overlay system.
 2015-08-21 09:50:39 +02:00
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards 
Refactors obj flags and changes defined bitflag representation
 2015-08-20 19:47:58 +03:00
PsiOmegaDelta
a0a09c04e4 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 2015-08-20 14:09:07 +02:00
Zuhayr
c8b6813426 Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery 
Uplink Items - Part III
 2015-08-20 19:19:12 +09:30
PsiOmegaDelta
1b64487f8d More computer overlay changes. 
Fixes #10764 and a couple other computers.
 2015-08-20 08:38:43 +02:00
mwerezak
1cb4afd906 Removes CHARGELEVEL_DEFAULT 2015-08-18 17:20:38 -04:00
mwerezak
ac738f3db4 Moves flags values to item_flags var 
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
 2015-08-18 17:18:25 -04:00
mwerezak
d3a40f4269 Cleans up defines 
Replaces bitflag values with hex literals. Some other miscellaneous
cleanup.
 2015-08-18 17:05:26 -04:00
Zuhayr
e3d9bc90e3 Added more colour defines, added functionality to the floor painter. 2015-08-18 13:41:04 -07:00
Zuhayr
3b712adb5f Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes. 2015-08-16 17:51:19 -07:00
Zuhayr
c8baafed2a Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and 
construction/deconstruction. Major map rework/changes.
 2015-08-16 06:05:21 -07:00
PsiOmega
c51e208094 One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686. 2015-08-15 15:22:37 +02:00
PsiOmegaDelta
77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
 2015-08-13 08:09:28 +02:00
PsiOmega
ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
 2015-08-12 21:18:18 +02:00
PsiOmegaDelta
1b7b69306c Prevents APC wires from being displayed to the AI. 
Restores and makes the mob type check more specific. Fixes #10559.
 2015-08-12 13:34:12 +02:00
GinjaNinja32
631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
 2015-08-11 18:47:05 +01:00
Chinsky
7f2d6e8b7f Merge pull request #10434 from Kelenius/ofCablesAndSnowflakes 
Of cables and snowflakes
 2015-08-11 19:40:45 +03:00
PsiOmega
e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
 2015-08-08 15:34:51 +02:00
Kelenius
92ca942fa9 Fixes #10219 - cables don't always qdel 
Dem snowflake code
 2015-08-05 18:13:38 +03:00
mwerezak
d1bd146b1a Changes reinforced glass material name 
Gives the reinforced glass material a name that is easier to verify for
correctness.
 2015-08-03 23:01:34 -04:00
mwerezak
0ceb0e291d Fixes #10314 
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
 2015-08-02 00:01:10 -04:00
PsiOmegaDelta
0ba7643217 Updates files as necessary to adhere to the new standard. 2015-07-27 09:32:51 +02:00
PsiOmegaDelta
388343a84e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/recharger.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob.dm
 2015-07-20 08:28:32 +02:00
Zuhayr
a45d26079f Merge pull request #10239 from mwerezak/lighting-fix 
Fixes #10210
 2015-07-19 20:13:55 +09:30
mwerezak
ac2dd5f3ca Fixes #10210 2015-07-19 00:25:09 -04:00
Zuhayr
c779482afc Merge with dev. 2015-07-15 16:20:39 +09:30
mwerezak
0b2b475be4 Adds lights to ERT shuttle, ERT ready light 
Fixes #10155
 2015-07-12 18:41:24 -04:00
RavingManiac
145b627464 Storage system altered to be storage space based 2015-07-12 22:25:43 +08:00
PsiOmegaDelta
b5a47fd43b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/power/rust/core_gen.dm
	code/modules/power/rust/fuel_compressor_construction.dm
	code/modules/power/rust/fuel_injector.dm
 2015-07-01 22:46:40 +02:00
Zuhayr
8ab80b7394 Removes the RUST engine. 2015-07-01 15:50:55 +09:30
Zuhayr
f096d5cabe Merge resolution. 2015-06-28 06:13:24 +09:30
Zuhayr
411987c68b Merge resolution with master. 2015-06-28 06:02:52 +09:30
GinjaNinja32
98572db1a0 Merge pull request #9940 from atlantiscze/connection_estabilished 
Fixes #9929
 2015-06-26 19:24:24 +01:00
Atlantis
90f08d3fa7 Fixes #9929 
- Adds missing connect_to_network() and disconnect_from_network() into TEG wrenching code.
 2015-06-26 18:22:59 +02:00
Zuhayr
6f00d831e5 Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct 
Base proc: emag_act
 2015-06-21 01:18:25 +09:30
PsiOmegaDelta
307f36e919 Compilation fixes. 2015-06-16 11:03:25 +02:00
PsiOmegaDelta
06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-06-16 10:52:33 +02:00
PsiOmegaDelta
cc7c502fb8 Updates emag attackby usages to emag_act where it's not too much of a headache. 2015-06-16 09:34:13 +02:00
PsiOmega
0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
Zuhayr
347e6df2ac Merge pull request #9704 from atlantiscze/clean-up-your-trash 
[Done] Implements Destroy()'s on some things
 2015-06-10 23:07:38 +09:30
Zuhayr
73146a62fe Merge pull request #9747 from PsiOmegaDelta/150608-NanoPaths 
NanoUI sources can now be datums instead of atom/movable.
 2015-06-09 20:08:02 +09:30
PsiOmegaDelta
20542bf84b NanoUI sources can now be datums instead of atom/movable. 
Also accidentally fixes #7042 as the AI no longer cares about the machinery var.
 2015-06-08 17:06:06 +02:00
Chinsky
94406a6430 Merge pull request #9694 from PsiOmegaDelta/150605-Meteors 
Ports /tg/'s meteors.
 2015-06-08 14:17:57 +03:00