cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-09 17:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,329 Commits 74 Branches 23 Tags
fb4d19d8ee00e4e2fa74c6b265268cf3b2a9155d
Commit Graph

7290 Commits

Author SHA1 Message Date
ZekeSulastin
fb4d19d8ee Replaces hardcoded UI length with constant 2014-07-05 23:37:12 -04:00
Mloc
4981d620d0 Merge pull request #5507 from mwerezak/supply-shuttle-fix 
Supply shuttle fixes
 2014-07-05 23:16:42 +01:00
mwerezak
0e15d55b24 Fixes #5459 2014-07-05 14:43:18 -04:00
Mloc
4c2767203c Merge pull request #5503 from mwerezak/heist-fix 
Fixes Heist ending immediately
 2014-07-05 11:32:37 +01:00
Zuhayr
89964ef0fa Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-07-05 11:04:03 +09:30
mwerezak
1aeb094a79 Fixes Heist ending immediately 2014-07-04 19:06:55 -04:00
Walter0o
65b5126147 fixes computers eating cards 
this commit : 
ea1060ac33

added in machinery's attack_hand() proc, line 238
```
if(!allowed(user))
		user << "\red Access Denied."
		return 1
```

to almost all machinery including computers, since they call this proc via their attack_hand() procs.

allowed(user), see access.dm line 94, in turn only checks the user's hand and wear_id,
NOT the card inside the machine,
as different machines have different vars and systems handling how they can be accessed.

instead of fixing the underlying problem, eject card verbs were added like this one : 
30385c2237

this PR reverts that nonsense machinery addition and adds the shuttle_control access check where it belongs.
 2014-07-04 21:36:23 +02:00
Zuhayr
34d19d16f5 Fffffff fixes crates not budging properly. 2014-07-05 04:17:12 +09:30
Mloc
53de412107 Merge pull request #5493 from Zuhayr/master 
Fixes
 2014-07-04 19:28:54 +01:00
Zuhayr
72e18b9eb5 Fixes #5214 2014-07-04 17:56:06 +09:30
Zuhayr
b670cdcdf1 Fixes #5483 2014-07-04 17:48:12 +09:30
Zuhayr
67da4096b3 Fixes #5461 2014-07-04 17:48:01 +09:30
Zuhayr
0c11ebe8e8 Fixes #5490 2014-07-04 17:39:45 +09:30
Zuhayr
4b06cf82f0 Fixes #5491 2014-07-04 17:34:30 +09:30
mwerezak
ac1a7ad6e2 Fixes air alarms not updating when area changes alert status 2014-07-04 03:00:42 -04:00
PsiOmega
9b97420e97 The AI system integrity restorer no longer needs head AND captain access. 2014-07-04 00:12:41 +02:00
Chinsky
447144f1ad Merge pull request #5477 from PsiOmegaDelta/AngryAI 
Adds a new set of AI status emotes.
 2014-07-03 20:39:51 +04:00
Chinsky
5724a77cdb Merge pull request #5474 from Zuhayr/master 
Fixes climbing through shutters.
 2014-07-03 20:38:56 +04:00
Zuhayr
07acb270d1 Merge pull request #5476 from Hubblenaut/wheelchair 
Wheelchair Fixes
 2014-07-03 13:16:14 +09:30
Chinsky
c3f3aaaeed Merge pull request #5473 from mwerezak/supply-console 
Makes the cargo console force-launch command more obvious
 2014-07-03 05:12:03 +04:00
Chinsky
67c425fe2b Merge pull request #5463 from mwerezak/emergency-shuttle 
Fixes shuttle ETA blanking out on launch, allows escape pods to be armed by breaking into the pod.
 2014-07-03 05:10:35 +04:00
Chinsky
173d7f1828 Merge pull request #5458 from Zuhayr/mutiny 
Mutiny tweaks.
 2014-07-03 05:10:20 +04:00
PsiOmega
a9c6a8cd03 Adds an Upset emote as well. 2014-07-03 00:22:10 +02:00
Hubblenaut
6a25d59f9a Gives test-firing an actual use 2014-07-02 23:14:41 +02:00
PsiOmega
0892d6315d Adds a new set of AI status emotes. 
The AI can now express anger and surprise.
 2014-07-02 23:09:46 +02:00
Hubblenaut
97f997dd30 Fixes in wheelchair and different handling of movement 2014-07-02 22:42:18 +02:00
Hubblenaut
dfece9fe12 Stops buckled mobs from slipping (for now) 2014-07-02 22:36:49 +02:00
Hubblenaut
c0ae74b813 Fixes non-existant feet getting bloodied and adds blood to wheelchairs 2014-07-02 22:34:50 +02:00
Zuhayr
0de57ddb2b Fucking Hell I'm an idiot. 2014-07-03 05:10:31 +09:30
unknown
3888a8b757 Makes the cargo console force launch command more obvious 2014-07-02 13:13:52 -04:00
mwerezak
e57419c725 Status displays now won't blank when undocking, too 2014-07-01 22:18:04 -04:00
mwerezak
8388ecb94a Allows escape pods to be armed from inside the pod 2014-07-01 21:55:37 -04:00
Zuhayr
ff9682af79 Wtf how did this line even get deleted. 2014-07-02 07:28:51 +09:30
Zuhayr
8b65aa727b Missed a linebreak. 2014-07-02 07:23:59 +09:30
Zuhayr
4f73f7a834 Cleans up some of the lore issues with Mutiny. 2014-07-02 07:22:33 +09:30
Zuhayr
65c0dc2e64 Changed Mutiny messages to use the existing Centcomm message format. 2014-07-02 07:14:35 +09:30
Zuhayr
9815eef21f Oversight with table fix. 2014-07-02 07:00:40 +09:30
Zuhayr
41488bf497 Compile fix. 2014-07-02 06:35:19 +09:30
Zuhayr
04a6ea92db Adds Eject ID verbs to record computers. 2014-07-02 06:17:54 +09:30
Zuhayr
aa4581e72f Fixes #5434 2014-07-02 06:17:26 +09:30
Zuhayr
b6806c0d22 Fixes #5443 2014-07-02 05:35:28 +09:30
PsiOmega
b60b555ffa Pipes, cameras, air alarms, emergency shutters, and new maintenance area added. 
Adds a number of missing supply pipes around the station.
Adds cameras to the new Hydrophonics/Garden and Xenoflora areas.
Adds an air alarm to one of the Hydrophonics areas, just fore of the new Garden.
Adds emergency shutters to the exterior windows of the Xenoflora lab.
The maintenance section port of the engine recycled another maintenance area, causing APC 'duplication'. Created new area instance.
 2014-07-01 08:24:54 +02:00
Mloc-Argent
6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm
 2014-06-30 23:44:46 +01:00
Chinsky
8d81675509 Merge pull request #5420 from mwerezak/emergency-shuttle 
Fixes #5418 - also a bunch of small shuttle fixes
 2014-07-01 02:10:23 +04:00
mwerezak
c147eb9034 Improves the display of shuttle ETAs 2014-06-30 18:00:28 -04:00
Zuhayr
ef5387fece Fixes #5113 2014-07-01 01:04:50 +09:30
Zuhayr
9803b30be0 Fixes #5188 2014-07-01 01:04:40 +09:30
Zuhayr
1f93cff0a6 Fixed lathes eating multitools and wirecutters when open. 2014-07-01 01:04:06 +09:30
PsiOmega
d7047091c5 Creates proper area instance of the engineering washroom. 2014-06-30 13:22:16 +02:00
PsiOmega
a3f13fd3bb Creates proper area instance of Cyborg Station, AI zone. 2014-06-30 13:16:56 +02:00