cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,368 Commits 74 Branches 23 Tags
20542bf84b28fd7e2f40b319c83c429500109c79
Commit Graph

19111 Commits

Author SHA1 Message Date
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
PsiOmega
26e5734e93 The AI screen now glows. 
With the color depending on the chosen display screen.
 2015-06-07 13:48:32 +02:00
PsiOmega
b5c0478ae2 Fixes compilation errors. 2015-06-07 11:14:06 +02:00
PsiOmega
fc6de24042 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm
 2015-06-07 10:51:41 +02:00
PsiOmega
fbc4bfbe9c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm
 2015-06-07 10:30:27 +02:00
PsiOmegaDelta
6eea4ae7da Merge pull request #9712 from mwerezak/all-things-to-everyone 
Chameleon items
 2015-06-07 09:01:11 +02:00
PsiOmegaDelta
2e920bce69 Merge pull request #9711 from mwerezak/syringelog 
Syringe gun logs, logging helper reorganization
 2015-06-07 09:00:21 +02:00
PsiOmegaDelta
ddc1f888dd Merge pull request #9717 from mwerezak/bombcap 
Adjusts how reagents_explosion applies bombcap.
 2015-06-07 08:50:45 +02:00
Zuhayr
1bb063041b Merge pull request #9718 from mwerezak/zonemerge 
Allows small zones to merge even if zone-blocked
 2015-06-07 15:13:09 +09:30
Zuhayr
2eb14e037f Merge pull request #9709 from PsiOmegaDelta/150606-GhostSpawn 
Fixes #9685.
 2015-06-07 15:06:09 +09:30
mwerezak
8567162461 Updates chameleon gun help text 2015-06-06 23:26:56 -04:00
mwerezak
03412a24f8 Allows indirectly connected turfs to merge zones if either zone is small enough. 
Fixes #9235
 2015-06-06 23:24:11 -04:00
mwerezak
821285bcee Adds defines for bombcap components 2015-06-06 22:38:56 -04:00
mwerezak
636ead5bbe Makes reagents_explosion apply bombcap in the same manner as tank transfer valves. 
Also fixed reagents_explosion/start() checking the flash var instead of the flashing var.

Fixes #8280
 2015-06-06 22:17:11 -04:00
GinjaNinja32
8d799293ba Merge pull request #9701 from Zuhayr/dev-freeze 
Fixes #9597
 2015-06-07 03:14:06 +01:00
Zuhayr
22bf5352a3 Merge pull request #9698 from PsiOmegaDelta/150605-ChockingLogs 
Fixes #9697
 2015-06-07 11:27:32 +09:30
mwerezak
3906989eac Mostly removes creation of throwaway objects from chameleon items 
- Replaces the creation of throwaway items from New() with initial() calls for all chameleon items.
- Unfortunately throwaway items could not be removed when switch appearance, as initial() does not work very will with list vars.
- Makes chameleon item name cache lists global.
- Makes chameleon guns a subtype of energy guns, removes chameleon magazines.
- Moves chameleon.dm to clothing module root
- Items without icon or icon_state are no longer selectable as chameleon appearances.
- Chameleon verbs go in their own panel.
 2015-06-06 18:19:23 -04:00
mwerezak
f62cc38883 Adds logging for syringe_gun 
Also updates holder get_reagents() output formatting
 2015-06-06 17:02:42 -04:00
mwerezak
e7757de068 Moves key_name() to logging.dm 2015-06-06 17:01:31 -04:00
PsiOmegaDelta
c4ecf46a4c Merge pull request #9713 from mwerezak/gunlag 
Muzzle flash sets lighting instead of creating objs
 2015-06-06 21:19:11 +02:00
GinjaNinja32
5f75e3038e Merge pull request #9710 from atlantiscze/beyond-undestructible 
Fixes #9705
 2015-06-06 20:16:17 +01:00
GinjaNinja32
dc40298fe8 Merge pull request #9703 from atlantiscze/stop-runtiming 
Fixes #9619
 2015-06-06 20:08:27 +01:00
mwerezak
15d82778cd Muzzle flash sets lighting instead of creating objs 
Shooting a gun no longer generates illumination objects
 2015-06-06 12:57:43 -04:00
mwerezak
0725b0cc3e Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments 2015-06-06 11:53:12 -04:00
Atlantis
265719b4aa Fixes #9705 
- Carboard now has Integrity of 10. For comparsion, wood has 25, steel 150 and plasteel 800.
 2015-06-06 17:30:43 +02:00
PsiOmega
cbead4224b Fixes #9685. 
Observer from the lobby do not have minds, while observers that once lived do.
Re-arranges the MayRespawn() logic to handle these situation.
 2015-06-06 15:44:49 +02:00
PsiOmegaDelta
e48b527c4b Merge pull request #9708 from atlantiscze/newmalf-manual-change 
RSC paths for ai_help command
 2015-06-06 15:41:24 +02:00
Atlantis
f0026b5c3b RSC paths for ai_help command 2015-06-06 14:55:33 +02:00
Atlantis
f66e5c9c94 Fixes #9619 2015-06-06 06:52:42 +02:00
Atlantis
4b19e8be69 Fixes #9548 
- AI's name is now correctly displayed when the AI is clientless while being grabbed with intellicard.
- AI's wireless radio is no longer automatically muted when the AI is transferred to intellicard. It may still be muted from the UI if the intellicard's owner wants it.
 2015-06-06 06:28:46 +02:00
Zuhayr
f03fc826f1 Fixes #9597 2015-06-06 11:20:56 +09:30
GinjaNinja32
fb1904ef4e Fixes a pair of null.z runtimes 
Fixes explosions with multiz maps breaking if the epicenter is null
Fixes supermatter trying to irradiate mobs in nullspace crashing the proc
 2015-06-06 02:23:06 +01:00
Zuhayr
44a6652d0a Merge pull request #9696 from Yoshax/morewizardfixes 
Makes scrying orb only usable by wizards
 2015-06-06 05:03:50 +09:30
GinjaNinja32
16faba0f7c Merge pull request #9692 from Baystation12/dev-freeze 
Dev freeze
 2015-06-05 20:32:30 +01:00
PsiOmega
711eb0501c Fixes #9697 
Replaces and closes the <span>
 2015-06-05 21:17:11 +02:00
Yoshax
7b19c85ac5 Makes file use user and not usr 2015-06-05 19:04:11 +01:00
PsiOmegaDelta
2da0a5e979 Merge pull request #9690 from Kelenius/ofPuffsAndCleaner 
Of puffs and cleaner
 2015-06-05 20:02:08 +02:00
Yoshax
afe081d836 Makes scrying orb only usable by wizards 2015-06-05 18:35:19 +01:00
Kelenius
345cd7a738 Adds a simulated check to chempuffs 2015-06-05 19:20:46 +03:00
Zuhayr
589aecd40e Merge pull request #9691 from Baystation12/master 
master into dev-freeze
 2015-06-05 21:41:58 +09:30
Chinsky
19e0a94c17 Merge pull request #9686 from PsiOmegaDelta/150605-DontDoThat 
Removes some qdel:s of lists.
 2015-06-05 15:10:53 +03:00
Chinsky
f163650cb2 Merge pull request #9652 from mwerezak/inflatable 
Corrects comment, multiz stub, no-zone default
 2015-06-05 14:48:30 +03:00
Kelenius
2ba5fd6af2 Merge branch 'dev-freeze' into ofPuffsAndCleaner 
Conflicts:
	code/game/objects/effects/chem/water.dm
 2015-06-05 14:36:15 +03:00
Chinsky
e1d6af1d27 Fixes #9352 2015-06-05 14:30:01 +03:00
Chinsky
e3f64178c8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade 2015-06-05 13:24:03 +03:00
PsiOmegaDelta
979b6adcae Removes some qdel:s of lists. 
Primarily done by removing the need for clearing the contents list of bio-lockers in the first place.
 2015-06-05 12:05:43 +02:00
PsiOmegaDelta
c3f0a46c19 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/storage/briefcase.dm
	html/changelogs/.all_changelog.yml
 2015-06-05 10:39:41 +02:00
Chinsky
026500ea06 Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade 2015-06-05 11:26:25 +03:00
PsiOmegaDelta
7f9996eece Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-05 10:23:23 +02:00
Chinsky
4b04ccb05d Axed couple unused organ flags, made them look a bit nicer with bitmove 2015-06-05 11:18:07 +03:00