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

21481 Commits

Author SHA1 Message Date
Spamcat
3dfbffbcd2 Fixes #11681 2015-12-20 20:05:07 +03:00
PsiOmegaDelta
4eb5ff1b87 Buckling and disability check tweaks. 
Buckling now returns fully buckled if you're restrained, otherwise partially buckled.
Wraps incapacitated(INCAPACITATION_DISABLED) in a proc call to ensure there's is only one place to alter in the future.
 2015-12-20 12:03:29 +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
ce3587d867 Hallucinations no longer burn on the SuperMatter 2015-12-19 21:33:02 -05:00
Zuhayr
593759b4e3 Merge pull request #11713 from PsiOmegaDelta/151219-AIQdels 
AI qdel() improvements.
 2015-12-20 11:15:10 +10:30
PsiOmegaDelta
378f62b81e AI qdel() improvements. 
AI destruction now cleans up more of its held objects and variables.
Fixes some issues with the AI powersupply qdel().
Fixes #11710.
 2015-12-19 11:45:24 +01:00
Chinsky
9a156c56de Merge pull request #11513 from Karolis2011/Constructable_Cargo 
Constructable Cargo
 2015-12-19 09:18:45 +03:00
Chinsky
4a0d121f25 Merge pull request #11702 from PsiOmegaDelta/151217-PolarFixesMaster 
No verbose cantouch check when not climbable
 2015-12-19 03:13:45 +03:00
PsiOmegaDelta
79f15fca01 Compilation fixes due to issues caused by merging https://github.com/Baystation12/Baystation12/pull/11617. 2015-12-18 09:33:14 +01:00
Loganbacca
07e81c059c Fixed bullets traveling diagonally through windows 
- Fixes #11465
 2015-12-18 20:12:46 +13:00
Hubblenaut
28919269ee Prevents blob from growing over asteroid walls 2015-12-18 07:59:49 +01:00
Zuhayr
740d10d3fc Fixes colour issues. 2015-12-18 07:58:54 +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
Neerti
0e3f37570a Makes radiation medication not actually irradiate you worse. 2015-12-17 17:56:36 +01:00
Hubblenaut
dce5a70572 Colors on-mob sprites 2015-12-17 17:54:44 +01:00
Hubblenaut
56d8975a19 Tweaks Filtering and Toxic Gases 2015-12-17 17:50:30 +01:00
Hubblenaut
dc2ad43dc5 No verbose cantouch check when not climbable 2015-12-17 17:44:04 +01:00
Zuhayr
64421e35ca Fixes some overlay issues with aiming. 2015-12-17 17:39:25 +01:00
Jon
d890a4ce30 Removes the else to properly for the switch statement, meaning that it no longer wipes your flavour text/thinks you're opening the general slot ever time. 2015-12-17 17:38:34 +01: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
Spamcat
a515f0469a Wrenched opwn welding tanks now explode when exposed to fire. 
#11537
 2015-12-16 17:59:05 +03:00
PsiOmegaDelta
f62f24e1ac Removes Stat() sleep. 
Fixes a Stat() runtime that occasionally occur if the client was logged out when the sleep() was done sleeping.
Fixes delays when using alt+Turf click.

Makes the alt+Turf click panel only update when viewed instead. Seems like the better performance fix option in general.
Makes the alt+Turf click panel always use the "Turf" name, consistency.
 2015-12-16 13:24:40 +01:00
PsiOmegaDelta
2e151ade47 Merge pull request #11696 from Baystation12/dev-freeze 
Dev
 2015-12-16 11:01:41 +01:00
PsiOmegaDelta
df6972dbbb Merge pull request #11695 from Baystation12/master 
Dev-freeze
 2015-12-16 10:51:05 +01: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
Chinsky
a4f8e8ac72 Merge pull request #11654 from PsiOmegaDelta/151210-TapeTape 
Adds research and medical tape.
 2015-12-16 08:31:23 +03:00
Zuhayr
1ab263f662 Rewrote targeting. 2015-12-16 10:10:13 +10:30
Zuhayr
2da40e525e Removed targeting. 2015-12-16 10:09:20 +10:30
Hubblenaut
d1f14cd16d Fixes duplicate gas layers 2015-12-15 13:42:31 +01:00
PsiOmegaDelta
037e9264e1 Merge pull request #11690 from Baystation12/dev-freeze 
Dev
 2015-12-15 11:51:12 +01:00
PsiOmegaDelta
6b5d237c46 The hacking tool item can now be bought through the Antag Uplink. 2015-12-14 09:56:55 +01:00
PsiOmegaDelta
a2d2a092c5 All the macros. 2015-12-13 15:19:14 +01:00
Dibasic
1e06889ef1 Fixes window 'bang' typo 
Fixes the typo when harm-intent clicking a window with your bare hand:

<You bang against the window!

to:

You bang against the window!
 2015-12-13 15:06:14 +01:00
PsiOmegaDelta
bbe65baf5c Merge remote-tracking branch 'upstream/dev' into 151210-TapeTape 
Conflicts:
	code/__defines/misc.dm
 2015-12-13 11:50:06 +01:00
PsiOmegaDelta
eda4a5d595 Adds tape to medical, and excavation lockers. 
Also maps in some EMT medical tape, corrects some badly rotated intercoms, and pixel shifts the large sinks properly.
 2015-12-13 11:48:29 +01:00
PsiOmegaDelta
12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm
 2015-12-13 10:47:33 +01:00
PsiOmegaDelta
b31a5ba836 Compilation fixes. 2015-12-13 10:21:00 +01:00
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
 2015-12-13 10:15:29 +01:00
Chinsky
911498fc32 Merge pull request #11679 from Baystation12/GinjaNinja32-patch-1 
fix slime core injecting not working
 2015-12-13 11:05:16 +03:00
Chinsky
939f62adc2 Merge pull request #11680 from SkyMarshal/melty-grenades 
Chem grenades are no longer melted by acid.
 2015-12-13 11:05:07 +03:00
SkyMarshal
415f78ee18 Chem grenades are no longer melted by acid. 
Fixes #10478
 2015-12-12 16:29:05 -07:00
PsiOmegaDelta
9332e39ef9 Merge pull request #11665 from SkyMarshal/monkeying-with-disposals 
Fixes #11093
 2015-12-12 23:32:58 +01:00
GinjaNinja32
972942552e Merge pull request #11676 from Kearel/mindswapfix 
Fixes #10550
 2015-12-12 22:24:45 +00:00
Joseph Heinemeyer
a5b0f86c19 s/"help"/I_HELP/g 2015-12-12 15:24:13 -07:00