cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-24 16:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,161 Commits 75 Branches 23 Tags
290a7d5000f3377973dda1068f64688cbe91efbe
Commit Graph

5311 Commits

Author SHA1 Message Date
Chinsky
e0c00bda55 Merge pull request #8973 from mwerezak/inventory2 
Inventory updates
 2015-04-26 20:13:21 +03:00
PsiOmega
fe09ed1a22 Merge remote-tracking branch 'upstream/dev' into BorgModules 
Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/mob/living/silicon/ai/subsystems.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_upgrades.dm
 2015-04-26 15:52:18 +02:00
PsiOmega
9df5048dbc Makes it possible for borg modules to include specific subystems. 2015-04-26 15:42:36 +02:00
PsiOmega
e54fbcb9ec Cleans up borg module code and responsibilities. 2015-04-26 12:00:30 +02:00
mwerezak
78a02c705b Removes unnecessary and out of place item dropping in human icon code. 2015-04-25 13:55:47 -04:00
mwerezak
4829f1d82d Adds calls to mob_can_unequip() where appropriate 2015-04-25 13:55:24 -04:00
mwerezak
3a00fce32b Refactors mob_can_equip(), adds unequip checks 2015-04-25 13:54:59 -04:00
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
 2015-04-24 17:13:37 +02:00
PsiOmega
e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
Chinsky
e0da322ee3 Merge pull request #8956 from mwerezak/gametime 
Makes crit oxyloss and malf AI timer run in gametime instead of realtime.
 2015-04-24 10:03:06 +03:00
PsiOmega
b9f8b0b8aa Re-shuffles huma/say(). Removes non-existing map variables. 2015-04-23 13:36:13 +02:00
PsiOmega
eee67109d1 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/say.dm
 2015-04-23 13:15:43 +02:00
PsiOmega
2aa9a70496 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-04-23 12:59:47 +02:00
mwerezak
7a8ae91c6a Makes crit oxyloss and malf AI time run in gametime instead of realtime. 2015-04-23 04:42:58 -04:00
Zuhayr
3fc9260187 Merge pull request #8954 from GinjaNinja32/diona_speech 
Fixes dionaea always using the verb "says".
 2015-04-23 17:02:20 +09:30
GinjaNinja32
07cc28af8e Fixes dionaea always using the verb "says". 
Not sure why, but speech_problem_flag is being set to 1 for dionaea, and only dionaea.
Fixes #8952
 2015-04-23 08:03:07 +01:00
Chinsky
71ffa782c4 Merge pull request #8914 from PsiOmegaDelta/BadMove 
Ensures new players cannot ghost by moving.
 2015-04-23 07:34:34 +03:00
PsiOmega
4cc524265b Change of random virus targets. 
The random virus event will now only infect mobs on station and which currently have a player that has been active in the last 5 minutes.
Placeholder until a more indepth discussion about what to do about the random event is concluded.
 2015-04-22 12:27:28 +02:00
GinjaNinja32
a440b228c9 Diona 'split' command, plus bugfix 2015-04-21 01:55:43 +01:00
Zuhayr
fc9c00bb5b Merge pull request #8867 from Jarcolr/patch-1 
Fixes #8810
 2015-04-20 18:04:04 +09:30
PsiOmega
799a5b79db Ensures new players cannot ghost by moving, really breaks things. 2015-04-20 08:37:57 +02:00
Chinsky
940b5c8c62 Merge pull request #8891 from volas/sanitize3 
sanitize() 3
 2015-04-19 14:59:36 +03:00
volas
7dedbc6d78 Alternative copytext, safe for html entities 2015-04-19 12:37:04 +03:00
Zuhayr
0b03a389df Merge pull request #8910 from Baystation12/master 
Master into dev
 2015-04-19 17:26:04 +09:30
PsiOmega
27abc7404d Gives AI a personal atmospherics control subsystem. 
Includes further work on NanoUI interactions.
 2015-04-19 00:24:19 +02:00
Zuhayr
05d05732f8 Merge pull request #8888 from PsiOmegaDelta/ThemLogs 
Ports the changelog system used by /vg/, /tg/, and others.
 2015-04-19 03:17:49 +09:30
Chinsky
511d3764e7 Merge pull request #8846 from PsiOmegaDelta/CantClickMeDontClickMe 
Makes objects without moues opacity not appear via alt-click.
 2015-04-18 16:57:01 +03:00
Chinsky
fb34bd361b Merge pull request #8860 from PsiOmegaDelta/SanityChecks 
Ghost-possession sanity checks.
 2015-04-18 16:56:36 +03:00
Chinsky
ead0ffdc29 Merge pull request #8853 from PsiOmegaDelta/ModuleStat 
Adds Hardsuit Module tab.
 2015-04-18 16:56:31 +03:00
Zuhayr
bc9d1ba38b Merge pull request #8893 from Baystation12/dev-freeze 
Dev freeze into dev
 2015-04-18 21:50:40 +09:30
PsiOmega
3edfbf0040 Moves us to the changelog system used by /vg/, /tg/, and others. 
Cleans up the HTLM folder, removing unused files.
Will also attempt include /tg/'s "You have unread changelog entries" notification on join.
 2015-04-18 13:00:28 +02:00
PsiOmega
860fb4946f Threating and actually using a signaler deadman switch now admin logged. 2015-04-18 12:18:14 +02:00
Jarcolr
c8256e70e1 Fixes #8810 
This is targeting dev branch because latest commit on dev is from March 22 and the latest on master is from February 1.
 2015-04-17 12:56:55 +03:00
PsiOmega
4748020ff2 Cleans up the Status panel. 2015-04-16 15:47:48 +02:00
PsiOmega
d381eb6083 Drops the machinery part of the singularity. 2015-04-16 12:51:02 +02:00
PsiOmega
08fa1193ce Adds Hardsuit Module tab. 
Allows one to (de)activate, engage, select and change module charges from the  	"Hardsuit Modules" tab panel.
Basic idea similar to spells.
 2015-04-16 08:54:04 +02:00
PsiOmega
a6a9cb76e8 Ghost-possession sanity checks. 
Adds sanity checks referred to in #8849.
 2015-04-15 16:10:36 +02:00
PsiOmega
2ddf8ecf28 Movement fixes. 
Ensures observers use Process_Incorpmove() despite being dead, while disallowing the once living from doing the same.
Ensures incorporeal creatures denied moving unto holy ground don't keep calling more movement code.
 2015-04-15 14:21:58 +02:00
Zuhayr
20cfea7813 Merge pull request #8852 from PsiOmegaDelta/AutoGhost 
Moving while dead now auto-ghosts you.
 2015-04-15 19:59:38 +09:30
Chinsky
3f93454017 Merge pull request #8849 from PsiOmegaDelta/GhostPossess 
Allow admins to drag-drop ghosts into mobs.
 2015-04-15 12:46:56 +03:00
PsiOmega
d8f1045e53 Moving while dead now auto-ghosts you. 
Also removes now redundant incorporeal_move check that's made further up the proc.
 2015-04-15 09:19:19 +02:00
PsiOmega
0d0786dfa1 Allows dead humans to speak, even if muzzled. 
Prevents a fate most cruel, at least when the ghost is still possessing its dead body.
 2015-04-15 09:06:04 +02:00
Zuhayr
1aee7282ff Quickfix for pariahs breaking cuffs. 2015-04-15 16:30:13 +09:30
PsiOmega
f9b3547e8d Allow admins to drag-drop ghosts into mobs. 
This functions the same way as editing the ckey in vv.
Has the same permission check as assume-direct-control.
It requires the admin also be a ghost to avoid conflicts with other drag drop code.
 2015-04-15 08:49:00 +02:00
PsiOmega
1bd4f21c58 Makes objects without moues opacity not appear via alt-click. 
Prevents clicking objects you should not be able to click.
 2015-04-15 08:31:40 +02:00
PsiOmega
516b60962e Merge remote-tracking branch 'upstream/dev' into CultPorting 2015-04-14 15:54:22 +02:00
Chinsky
32534346c7 Merge pull request #8773 from mwerezak/dislocation 
Adds dislocating joints using a neck grab
 2015-04-14 16:35:24 +03:00
PsiOmega
0466a1f47a Camera network refactor - Part 3 
Swept through every single Z-level, re-named/networked every single camera.
Fixes the AI Jump-To-Network verb not properly updating the network (used by the Show-Camera-List verb).
Also removes redundant Cancel option in the Show-Camera-List.
 2015-04-14 11:41:01 +02:00
mwerezak
d6498cd45f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dislocation 
Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/human_organs.dm
 2015-04-13 17:12:02 -04:00