Commit Graph

18307 Commits

Author SHA1 Message Date
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
Mloc
53de412107 Merge pull request #5493 from Zuhayr/master
Fixes
2014-07-04 19:28:54 +01:00
Chinsky
ff835cee53 Merge pull request #5492 from mwerezak/alarm-icon
Fixes air alarms not updating when area changes alert status
2014-07-04 20:56:43 +04:00
Chinsky
b0b1ec1e6d Merge pull request #5494 from Mloc/bs12-helpicantmove
mob: fix a movement issue
2014-07-04 20:53:28 +04:00
Mloc-Argent
25ec90ba26 mob: fix a movement issue
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-04 17:54:25 +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
Chinsky
ab6f2611f3 Merge pull request #5484 from Serithi/master
Fixed Tajaran shaggy hair sprites.
2014-07-04 08:05:09 +04:00
Chinsky
c46667bab4 Merge pull request #5489 from PsiOmegaDelta/AirPermissions
Fixes #5487
2014-07-04 05:29:13 +04:00
Chinsky
9873a92665 Merge pull request #5486 from PsiOmegaDelta/IntegrityFix
The AI system integrity restorer no longer needs head AND captain access
2014-07-04 05:28:56 +04:00
Mloc
cf982d1f6c Merge pull request #5482 from PsiOmegaDelta/master
Connects APC in Misc. Research, removes runaway emergency shutter
2014-07-04 00:02:18 +01:00
PsiOmega
b86b80f963 Fixes #5487
Isolation air alarms now expect atmos, engineering, OR research access.
2014-07-04 00:28:06 +02:00
PsiOmega
9b97420e97 The AI system integrity restorer no longer needs head AND captain access. 2014-07-04 00:12:41 +02:00
Zuhayr
e260cf5129 Merge pull request #5480 from Hubblenaut/master
Fixes earmuffs and custom items for ear slot not showing up properly
2014-07-04 04:41:25 +09:30
Serithi
9b16f55cdd Fixed Tajaran shaggy hair sprites
Side and north sprites were still the old brown instead of greyscale,
which messed with coloring.
2014-07-03 13:08:26 -04: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
PsiOmega
a79955ba77 Connects APC in Misc. Research, removes runaway emergency shutter
The APC in misc. research was lacking a cable end under its terminal. Has been corrected
There was a random emergency shutter in Xenofauna.. no idea how it got there >_>
Freebie: Sets up the vents in the server room to utilize the new environment mode change defaults.
2014-07-03 18:24:35 +02:00
Zuhayr
07acb270d1 Merge pull request #5476 from Hubblenaut/wheelchair
Wheelchair Fixes
2014-07-03 13:16:14 +09:30
Hubblenaut
3d1195d1a7 Hides ear equipment on BLOCKHAIR and BLOCKHEADHAIR flags 2014-07-03 03:43:15 +02:00
Hubblenaut
4f7dc5c9f5 Renders ears above hair level, fixes rendering of earmuffs and custom item 2014-07-03 03:30:16 +02:00
Chinsky
e21206340e Merge pull request #5470 from Walter0o/patch-1
trivial silicon show_system_integrity() fix
2014-07-03 05:13:21 +04:00
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
9377d078d6 Merge pull request #5469 from PsiOmegaDelta/Mining
Fixes #5468
2014-07-03 05:11:04 +04:00
Chinsky
08d61854f6 Merge pull request #5467 from PsiOmegaDelta/Tweak
Emergency shutters and Xenobiology door-renaming.
2014-07-03 05:10:56 +04:00
Chinsky
a3cff314bd Merge pull request #5466 from Hubblenaut/master
Fixes Sasha Mason-Kalinka's custom item
2014-07-03 05:10:49 +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
4981f3409f Fixes wrong person getting movement penalty 2014-07-02 22:43:17 +02:00
Hubblenaut
164bf15166 Minor code cleanup 2014-07-02 22:42:53 +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
abef4bf943 Fixes teleporting while buckled 2014-07-02 22:35:11 +02:00
Hubblenaut
c0ae74b813 Fixes non-existant feet getting bloodied and adds blood to wheelchairs 2014-07-02 22:34:50 +02:00
Hubblenaut
0abfad0bbb Turns movable chairs on click 2014-07-02 22:33:33 +02:00
Zuhayr
b690f927ba Fixes #5472 2014-07-03 05:20:29 +09:30
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
Walter0o
3bab559fc8 fixes weird drone health status
a non-damaged drone has 35 health and 35 maxHealth.
in the current proc, that is shown as (( 35 +35)/(35*2))*100 = 100 % health
a drone at half its health has 17.5 health.
current proc : (( 17.5 +35)/(35*2))*100 = 75 % health
a dead drone has 0 health.
current proc : ( 0 +35)/(35*2))*100 = 50 % health

as i fixed this proc in the silicon parent proc, this can be removed.
2014-07-02 18:15:08 +02:00
Walter0o
292f8adfe0 fixes weird silicon health status
a non-damaged cyborg has 200 health.
in the current proc, that is shown as (200+100)/2 = 150 % health
a dead borg has 0 health.
in the current proc, that is shown as (0+100)/2 = 50 % health
2014-07-02 18:06:25 +02:00
PsiOmega
79d3c0ae3f Fixes #5468
Less space inside the west mining wing.
2014-07-02 17:53:16 +02:00
Hubblenaut
87246e8809 Fixes spelling mistake in 'radi_pendant' 2014-07-02 17:20:28 +02:00
PsiOmega
c5121812d6 Emergency shutters and Xenobiology door-renaming.
New setup of emergency shutters to replace a currently removed set in Xenobiology.
The door to Xenobiology/fauna is no longer labeled Misc. Research.
Moves a fire extinguisher away from emergency shutter turf, as a closed shutter may prevent access.
2014-07-02 16:56:26 +02:00