cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-25 08:42:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,653 Commits 75 Branches 23 Tags
31c41f39b333cecdc5517aa7d586fc00ea49b0e2
Commit Graph

5343 Commits

Author SHA1 Message Date
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
a95927d653 Merge pull request #11728 from Baystation12/dev-freeze 
Dev
 2015-12-22 12:08:45 +01:00
PsiOmegaDelta
d7eaed8c67 Span correction. 2015-12-22 10:59:33 +01:00
PsiOmegaDelta
3cf0a0e182 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-12-22 10:46:55 +01:00
ccomp5950
fe62634775 Stumpy hands and arms can no longer pull stuff out of bags and such. 
Resolves #11404
 2015-12-21 17:56:30 -05: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
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
Loganbacca
07e81c059c Fixed bullets traveling diagonally through windows 
- Fixes #11465
 2015-12-18 20:12:46 +13: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
Hubblenaut
dc2ad43dc5 No verbose cantouch check when not climbable 2015-12-17 17:44:04 +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
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
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
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
SkyMarshal
415f78ee18 Chem grenades are no longer melted by acid. 
Fixes #10478
 2015-12-12 16:29:05 -07:00
Chinsky
36803747a2 Merge pull request #11445 from Kearel/fluff2 
[FEATURES] Adds entertainment items
 2015-12-12 16:49:01 +03:00
Chinsky
0bd13d5617 Merge pull request #11669 from PsiOmegaDelta/151212-DestroyDestroy 
Observer fixups.
 2015-12-12 14:42:05 +03:00
PsiOmegaDelta
f74bd5e1d9 Observer fixups. 
Adds a proper proc for raising events.
Now only creates the observer lists when an object registers itself.
Multitools now unregister themselves properly from buffers on Destroy().
 2015-12-12 12:06:05 +01:00
PsiOmegaDelta
2f73635cf3 Misc fixes. 
The station alert console no longer uses the old interact proc() to open the window interface.
Makes the records computers use the ui_interact proc to show the window.
This fixes https://github.com/PolarisSS13/Polaris/issues/537.

The station alert console now registers alarms using the correct procs.

The proper fingerprint type should now be applied during Topic() call (this means that admin observer object NanoUI interactions now have a degree of logging).
 2015-12-12 10:59:29 +01:00
Hubblenaut
3127ee28b5 Fixes subcategories of floor tiles not being placable 2015-12-11 11:08:36 +01:00
PsiOmegaDelta
6ab585fbf2 Adds research and medical tape. 
To cordon dig sites, major medical incident areas, etc.
 2015-12-11 08:45:55 +01:00
Kearel
9450680b1c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-10 13:04:52 -06:00
Zuhayr
c4c63b5d19 Forensics fixes/tweaks. 2015-12-10 19:34:28 +10:30
Zuhayr
f1630108db Fixes #10915 2015-12-10 10:32:35 +10:30
Chinsky
60e785da97 Merge pull request #11458 from PsiOmegaDelta/151117-MultitoolPower 
Multitool Upgrade
 2015-12-09 21:34:12 +03:00
Chinsky
64b5623d70 Merge pull request #11544 from atlantiscze/inflatables-squashed 
Robot inflatables v2
 2015-12-09 21:32:27 +03:00
Chinsky
2e5547daec Merge pull request #11642 from GinjaNinja32/indentation 
Travis now checks incorrect indentation of absolute paths
 2015-12-09 21:32:17 +03:00
GinjaNinja32
1921c35231 fix issues with indented absolute path definitions 2015-12-09 14:12:54 +00:00
Atlantis
d61a34e054 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into inflatables-squashed 2015-12-09 14:47:02 +01:00
GinjaNinja32
5b7f9cd114 Merge pull request #11639 from PsiOmegaDelta/151209-GhostFix 
Fixes ghost examination bug.
 2015-12-09 08:14:55 +00:00
Chinsky
c9542be1ce Merge pull request #11630 from PsiOmegaDelta/151207-RotationalIcons 
Rotational icons
 2015-12-09 11:08:24 +03:00
Neerti
af3bdef777 Fixes ghost examination bug. 2015-12-09 09:03:39 +01:00