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

21771 Commits

Author SHA1 Message Date
Ccomp5950
56b4982034 Merge pull request #11873 from PsiOmegaDelta/160102-Yona 
Tweaks and fixes.
 2016-01-12 10:28:30 -05:00
Chinsky
97964912d3 Merge pull request #11971 from Ccomp5950/shuttle_unit_test 
Unit Tests: Gives the shuttle a little more time.
 2016-01-12 13:18:40 +03:00
ccomp5950
fb67f09215 Gives the shuttle a little more time. 
Also makes it where instead of a sleep we implement our own timer allowing other
tests to finish if they are ready.
 2016-01-12 04:15:00 -05:00
Zuhayr
7439b7bcf4 Attempting to fix perma-wet-floors bugs. 2016-01-12 08:59:59 +01:00
Ccomp5950
cdc556f131 Merge pull request #11969 from comma/directions 
Direction signs 2 : Generic Bogaloo
 2016-01-12 02:29:25 -05:00
Chinsky
4a6056b945 Adds generic direction sign. 2016-01-12 09:42:06 +03:00
GinjaNinja32
83f22da2e6 Merge pull request #11957 from PsiOmegaDelta/160110-ProcessedEvents 
Event manager tweaks.
 2016-01-11 17:15:07 +00:00
PsiOmegaDelta
e90bfad7de Merge pull request #11935 from comma/wounds 
Limb reattachment heals missing limbs now
 2016-01-11 17:37:25 +01:00
PsiOmegaDelta
2740858cfe Merge pull request #11934 from comma/malpractice 
Can use items on roller/optable people on help intent
 2016-01-11 17:37:15 +01:00
GinjaNinja32
3aa3073f51 Merge pull request #11964 from GinjaNinja32/dev 
dev...dev-freeze
 2016-01-11 07:59:05 +00:00
GinjaNinja32
87f645a267 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2016-01-11 07:51:07 +00:00
GinjaNinja32
d1dfcd7a40 Merge pull request #11961 from atlantiscze/2016-01-11-metal-is-not-steel 
Fixes incorrectly set entry for steel in Circuit Imprinter
 2016-01-11 07:47:55 +00:00
PsiOmegaDelta
9b449cc183 Merge pull request #11963 from Baystation12/master 
Dev-freeze
 2016-01-11 08:28:56 +01:00
Atlantis
17aa6087a0 Fixes incorrectly set entry for steel in Circuit Imprinter 2016-01-11 06:44:28 +01:00
GinjaNinja32
a00a6ae0e6 Fix #11955 2016-01-10 22:12:12 +00:00
PsiOmegaDelta
b1fea3b090 Event manager tweaks. 
Moves the event manager processing into the process itself.
Ensures the last_object var is properly set in case of issues.
Also fixes a potential risk of the camera damage event looping forever.
 2016-01-10 21:18:20 +01:00
GinjaNinja32
4ee1f0b874 Merge pull request #11954 from PsiOmegaDelta/160110-RuntimeTheLessEternal 
Runtime is now less spooky while dead or otherwise incapacitated.
 2016-01-10 15:43:42 +00:00
Chinsky
c6e31a1fef Merge pull request #11952 from Techhead0/ShippingError 
Adds the "Shipping Error" random event.
 2016-01-10 18:35:41 +03:00
Chinsky
cc6dbc1815 Merge pull request #11951 from Ccomp5950/fix_vision_shit 
Meson Scanners now "see in the dark"...again.
 2016-01-10 18:35:36 +03:00
PsiOmegaDelta
70d3a012dc Runtime is now less spooky while dead or otherwise incapacitated. 
Fixes #11950.
 2016-01-10 12:57:04 +01:00
PsiOmegaDelta
de81681f91 Merge pull request #11932 from comma/screensaver 
Added standby icon to powered modular consoles.
 2016-01-10 12:26:23 +01:00
Techhead0
ec805ef9f5 Adds the "Shipping Error" random event. 
Adds a new random event that puts a free random crate on the next supply shuttle.
 2016-01-10 04:21:29 -05:00
ccomp5950
b5a8ca6e22 Removes qdel from mob unit tests. 
Speeds up Unit Testing for mobs instead of taking 1 second per test.
 2016-01-10 00:43:45 -05:00
ccomp5950
50423af7a5 Adds Unit Test for Mesons and NVG's see invis (to not see darkness) 2016-01-10 00:34:40 -05:00
ccomp5950
fe981a8928 Removes outdated information. 
The define is no longer kept in that location.
 2016-01-10 00:33:33 -05:00
ccomp5950
f2feb742ff Meson Scanners now "see in the dark"...again. 
This is most likely the 4th time I've fixed this.

Fixes: #11787
 2016-01-09 21:59:10 -05:00
Chinsky
6cc4c26560 Merge pull request #11944 from PsiOmegaDelta/160108-PolDev 
Various fixes.
 2016-01-09 23:39:17 +03:00
Chinsky
4c81f55d36 Merge pull request #11947 from atlantiscze/2016-01-09-PowerMonitorAlarm 
Power monitor tweaks
 2016-01-09 23:39:13 +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
Chinsky
bd5aa0cac0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into screensaver 
Conflicts:
	icons/obj/modular_console.dmi
	icons/obj/modular_laptop.dmi
 2016-01-09 10:25:21 +03:00
Atlantis
71a10aa218 Fixes tablets from custom loadout starting without processor installed. 2016-01-09 07:00:40 +01:00
Atlantis
9f4b5c6920 Power monitor tweaks 
- Power monitor now has modular computer header icon.
- Power monitor now updates the computer's texture depending on whether there is a power network alert or not, as it used to do in the past.
 2016-01-09 06:28:32 +01: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
Datraen
8eaf6804e6 Fixes #685. 2016-01-08 18:13:47 +01:00
Chinsky
1c0ca68904 Now only removing one stump per replacement. 
Which limb creates which wound isn't tracked anywhere, but eh, as long as number of stumps is sane.
 2016-01-08 19:41:48 +03:00
PsiOmegaDelta
5524739e70 Tweaks the datum pooling. 2016-01-08 16:03:54 +01:00
PsiOmegaDelta
6061556f1c Fixes the PP shortcut in the Check Antag panel. 2016-01-08 15:40:36 +01:00
PsiOmegaDelta
2c1debbcaa Logging tweaks. 
Uploading a new library book now also gives an admin notice.
Admin logs will now add a (JMP) if at all applicable.
 2016-01-08 15:22:43 +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
875d8455f0 Pooling Update from TG 
Ports https://github.com/tgstation/-tg-station/pull/13279.
 2016-01-08 14:47:13 +01:00
Hubblenaut
a89c066905 Fixes onmob icons for holders 
Conflicts:
	code/game/objects/items.dm
 2016-01-08 14:47:08 +01:00
Datraen
18d0c782fb Adds extended info to certain game modes missing extended info. 
Conflicts:
	code/game/gamemodes/heist/heist.dm
 2016-01-08 14:47:03 +01:00
Dibasic
e9dac928b0 Cold air shiver typo fix 2016-01-08 14:46:58 +01:00
PsiOmegaDelta
f9b61ed1ec Merge pull request #11943 from Baystation12/dev-freeze 
Dev
 2016-01-08 14:27:32 +01:00
PsiOmegaDelta
cf463ffd48 Merge pull request #11942 from Baystation12/master 
Dev-freeze
 2016-01-08 13:59:21 +01:00
PsiOmegaDelta
8ea8c342bc Merge pull request #11940 from comma/pixelhunt 
Makes inventory slots forward clicks to items in them
 2016-01-08 13:37:47 +01:00
PsiOmegaDelta
596bcdf55f Merge pull request #11938 from atlantiscze/2016-01-07-MultiThreading 
Modular Computer Multitasking + Fixes
 2016-01-08 13:37:25 +01:00
GinjaNinja32
8e21267ec2 Merge pull request #11941 from Ccomp5950/SANIC 
Unit Tests:  Disables asteroid generation.
 2016-01-08 09:40:29 +00:00