cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 02:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,047 Commits 74 Branches 23 Tags
7fffed2e4ef8d466e882a90bcd8a2401bbbb231d
Commit Graph

3183 Commits

Author SHA1 Message Date
Chinsky
4143352d48 Merge pull request #12005 from PsiOmegaDelta/160118-MoveMe 
Adds the moved event.
 2016-01-21 07:24:37 +03:00
PsiOmegaDelta
cc09a86601 Optimizes moved registrations. 
Now limits moved registrations to when strictly necessary. That is:
* When entering a movable atom, the entering object only registers to its moved event if it has moved listeners on its own.
* Instead, when registering to a moved event, registrations occur recursively until a non-/atom/movable is encountered or a prior movement registration from the same object is reached.
 2016-01-20 11:11:27 +01:00
PsiOmegaDelta
91a0ae2db4 Merge pull request #11994 from atlantiscze/2016-01-16-robotchanges 
Robot module changes
 2016-01-20 08:06:23 +01:00
PsiOmegaDelta
1210a6e42f Adds the moved event. 
Allows movable atoms to follow other movable atoms, as quickly as BYOND allows. Also supports following atoms inside other atoms.
However, this only works fully when Move() or forceMove() is utilized. Setting loc directly will not raise the moved event.
 2016-01-18 20:16:48 +01:00
Atlantis
b18389e39d Buffs backpack capacities 
- From 4 normal items to 7 normal items
 2016-01-17 08:57:21 +01:00
Chinsky
f645de8713 Merge pull request #11999 from Techhead0/DevFixes 
Dev fixes: Sheets, Belts, Hair
 2016-01-17 03:45:38 +03:00
Techhead0
8ef7336a2c Fixes #11990 2016-01-16 13:32:36 -05:00
Atlantis
9d98c4ab2a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 2016-01-16-robotchanges 2016-01-16 13:03:26 +01:00
Atlantis
ea5504c9ae Adds a floodlight cyborg upgrade 
- Floodlight upgrade doubles cyborg's light intensity, but increases power usage from cyborg's power cell considerably.
- It may be obtained via exosuit fabricator as other upgrades do. Application requires a roboticist/research bot
 2016-01-16 12:58:26 +01:00
Atlantis
dd74c30b58 Replaces Construction module 
- Construction module merged back into Engineering module.
- RCD is not available by default. It is now an upgrade, as is the jetpack for mining module, etc.
- Matter synth capacities adjusted a bit. Steel increased from 40 sheets to 60 sheets. Originally (before matter synths were introduced at all) engiborgs had approx. 100 sheets worth of materials. Plasteel increased from 10 sheets to 20 sheets since rwalls require 4 sheets, instead of 2 for quite some time now.
- Adds possibility to install a matter bin into cyborg. Matter bin multiplies cyborg's material capacity. Obviously this is most useful for engineering borgs. Default multiplier is 1, regular matter bin has 2, advanced matter bin 3 and super matter bin 4.
 2016-01-16 12:38:02 +01:00
Ccomp5950
228454c7d0 Merge pull request #11965 from PsiOmegaDelta/160111-Tele 
Makes it possible to convert uplink TCs into physical form.
 2016-01-15 02:08:07 -05:00
Zuhayr
cc4c86c995 Fixes #270 2016-01-14 08:37:10 +01:00
PsiOmegaDelta
5a4a240e43 Merge remote-tracking branch 'upstream/dev' into 160111-Tele 
Conflicts:
	baystation12.dme
 2016-01-13 12:10:57 +01:00
Ccomp5950
56b4982034 Merge pull request #11873 from PsiOmegaDelta/160102-Yona 
Tweaks and fixes.
 2016-01-12 10:28:30 -05:00
PsiOmegaDelta
dcfe907ff0 Makes it possible to convert uplink TCs into physical form. 
These crystals can be inserted into active uplinks, making it possible to trade them.
Variant of https://github.com/ParadiseSS13/Paradise/pull/3174/files.

The uplink now always shows the description to avoid annoying button shifting.
 2016-01-11 16:58:42 +01:00
Chinsky
6cc4c26560 Merge pull request #11944 from PsiOmegaDelta/160108-PolDev 
Various fixes.
 2016-01-09 23:39:17 +03:00
Ccomp5950
6eaaacf58f Merge pull request #11945 from PsiOmegaDelta/160108-GhostlyAccess 
Admin observers now have an all access id.
 2016-01-09 02:40:18 -05:00
PsiOmegaDelta
ce1b138387 Admin observers now have an all access id. 
Gives them further control over modular computers.
 2016-01-08 23:26:30 +01:00
GinjaNinja32
f7ec85e0f0 Merge pull request #11933 from comma/mirrormirror 
Handheld mirror
 2016-01-08 22:09:22 +00:00
PsiOmegaDelta
a83e78a648 Merge remote-tracking branch 'upstream/dev' into 160102-Yona 
Conflicts:
	code/modules/modular_computers/file_system/programs/ntnrc_client.dm
 2016-01-08 19:02:30 +01:00
PsiOmegaDelta
afd526126d Fire extinguisher fixes and tweaks 
Port of https://github.com/PolarisSS13/Polaris/pull/713.
 2016-01-08 14:47:18 +01:00
PsiOmegaDelta
f9b61ed1ec Merge pull request #11943 from Baystation12/dev-freeze 
Dev
 2016-01-08 14:27:32 +01:00
Chinsky
6f2450c3d5 Unrelatedly cleans up some dark ages-styled code. 2016-01-07 21:18:29 +03:00
Ccomp5950
97c0635fad Merge pull request #11927 from comma/devfix 
Devfixes
 2016-01-07 13:03:26 -05:00
Hubblenaut
cd0a1221d5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2016-01-07 14:37:18 +01:00
Chinsky
bc390c5603 Fixes #11914 2016-01-07 05:49:16 +03:00
PsiOmegaDelta
39bbca416a Adds missing istype() check before the secure brief case emag check. 
Fixes #11900.
 2016-01-06 18:31:39 +01:00
Hubblenaut
e1f58161ac Diverse Police Tape fixes/tweaks 2016-01-05 19:14:18 +01:00
RavingManiac
a8cea3862d Backpack and box storage capacity set to 16 and 8 respectively. Maximum w-class set to 4 and 3 respectively. 
Storage box sprite made lighter to improve visibility against dark backgrounds.
 2016-01-05 22:26:15 +08:00
RavingManiac
6e82dfa381 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2016-01-04 19:25:36 +08:00
Zuhayr
5ec489aef5 Added a colour selector to the floor painter, added the floor painter to the construction and drone modules. 
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2016-01-02 12:23:30 +01:00
Ccomp5950
7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis 
Qdel() tweaking and a bonus
 2016-01-01 23:58:29 -05:00
Karolis2011
3076884f6e Adds new modular ID modification console and 
removes old console. This commit won't compile.
 2015-12-31 13:17:31 +02:00
PsiOmegaDelta
96cbc225ff Bags with the auto-pickup ability can no longer grab anchored objects. 
Also fixes the canUnEquip() proc. It now only checks state, it doesn't change it. Fixes #11819 and probably a couple other odd item interactions.
 2015-12-30 11:28:54 +01:00
Atlantis
605b78d377 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2 2015-12-29 20:25:34 +01:00
PsiOmegaDelta
a4545f8ded Scheduler, observation, and New() tweaks. 
Corrects a number of places where New() did not call ..(), and implements similar changes to attempt to ensure New()/initialize() complete running before qdel() runs.
Cuts down on the number of created items during server start.
 2015-12-27 17:44:53 +01:00
GinjaNinja32
2d5b677a62 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-12-25 03:51:40 +00:00
GinjaNinja32
7cca8416b3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-12-25 03:41:33 +00:00
Sebastian Broberg
90f27ca42c Fixes chemgrenades 
Fixes #11686
 2015-12-23 23:46:53 +01:00
PsiOmegaDelta
8ce1b47943 Using the multitool on equipment now adds a set of fingerprints. 2015-12-23 13:33:52 +01:00
PsiOmegaDelta
f6eec096e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_onclick/click.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-12-20 11:55:53 +01:00
PsiOmegaDelta
c78f98754a Utensils now respect the lack of mouths, and has a delay on feeding others. 2015-12-20 11:46:42 +01:00
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2015-12-20 11:22:08 +01:00
ccomp5950
6736fb54e7 Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev 
Conflicts:
	code/game/area/Space Station 13 areas.dm
 2015-12-17 20:25:36 -05:00
Spamcat
905070bc96 \the 2015-12-16 20:30:26 +03:00
Spamcat
8df6ee3318 \red >> styles 2015-12-16 20:21:10 +03:00
Spamcat
485a2fdd45 Made kitchen utensils less dangerous. 
#11370
 2015-12-16 20:07:35 +03:00
Spamcat
f2ac9a023b pAIs no longer see custom emotes twice. 
fuck i spent way too much time on a single line fix
 2015-12-16 19:36:14 +03:00
Chinsky
8413d7bd20 Merge pull request #11682 from Zuhayr/guns 
Targeting rewrite.
 2015-12-16 08:40:21 +03:00
Chinsky
10c2490719 Merge pull request #11688 from PsiOmegaDelta/151214-Hacktool 
The hacking tool item can now be bought through the Antag Uplink.
 2015-12-16 08:31:47 +03:00