Chinsky
2b94441555
Merge pull request #5899 from Ccomp5950/fueltanks-yay
...
Fueltanks now log and admin_msg when shot at / weldered
2014-08-06 03:13:25 +04:00
mwerezak
018079beb5
Fixes gas mixture bugs, other bugs, and cleanup
...
In particular, gas_mixture/remove() was not accounting for
group_multiplier when determining the maximum amount of gas to remove
Also cleans up the interface for gas_mixture/heat_capacity().
2014-08-05 17:04:17 -04:00
Zuhayr
00fc8c53ba
Merge pull request #5898 from Walter0o/patch-1
...
fixes #5876
2014-08-05 13:22:26 +09:30
Ccomp5950
52da372bac
Fueltanks now log and admin_msg when shot at / weldered
2014-08-04 21:11:09 -05:00
mwerezak
f50a24163b
Updates medical equipment power usage
...
Also adds a couple of cell chargers to engineering workshop and aux tool
storage.
2014-08-04 21:27:19 -04:00
mwerezak
d662c5e804
Fixes issues with group_multiplier, filtering lists
2014-08-04 20:56:22 -04:00
mwerezak
949cdd275b
Updates portable pumps and scrubbers
2014-08-04 20:55:45 -04:00
Ccomp5950
ec3262a2a9
Merge pull request #5894 from atlantiscze/cyborg_module_icons
...
Cyborg component icons!
2014-08-04 19:38:57 -05:00
Ccomp5950
4df46548ac
Merge pull request #5896 from Glloyd/fixes
...
Two Fixes
2014-08-04 19:37:02 -05:00
Zuhayr
33ef081191
Merge pull request #5895 from mwerezak/fixes
...
Fixes
2014-08-05 08:23:38 +09:30
Walter0o
dcc3393b25
fixes #5876
...
stun beams killed simple animals
2014-08-04 23:41:23 +02:00
mwerezak
b7c13bc4b6
Allows atmos helpers to be used with portable_atmos
2014-08-04 16:53:13 -04:00
Ccomp5950
f95074d17e
Merge pull request #5887 from mwerezak/jetpack-icon
...
Fixes #5852
2014-08-04 15:17:02 -05:00
Ccomp5950
a4fc1bfd6a
Merge pull request #5886 from mwerezak/stun-baton
...
Fixes some handcuff oversights
2014-08-04 15:15:52 -05:00
Ccomp5950
c3e5cb8eb7
Merge pull request #5885 from Walter0o/lipstick_fix
...
lipstick wiping fix
2014-08-04 15:14:42 -05:00
Graham Lloyd
2c30af6124
Fireaxe cabinet hacking now fails if player moves away
2014-08-04 14:53:33 -04:00
Graham Lloyd
029a3f3abd
fixes wall rechargers showing up as normal rechargers.
2014-08-04 14:52:51 -04:00
mwerezak
c9f16ec665
Fixes freezer UI bug
2014-08-04 14:48:47 -04:00
mwerezak
a772d9094c
Optimizes pipe network updating
2014-08-04 13:29:09 -04:00
mwerezak
c640729b4d
Rewrite of passive gate, updates air injector
2014-08-04 13:28:48 -04:00
mwerezak
6a7c9e46e6
Fixes #5881
2014-08-04 13:04:34 -04:00
Atlantiscze
3627417c7b
- Adds cyborg module icons. Each component has it's own specific icon now. Two icons are animated, four static. Includes broken versions.
...
- AI radio icon (chat icon) updated to use icon from robot_component.dmi file - removed duplicity from radio.dmi
- Cyborg radio icon (chat icon) updated to look like the radio module.
2014-08-04 09:25:53 +02:00
mwerezak
14b57e3560
Pipe networks now cache their total volume
2014-08-03 22:41:31 -04:00
mwerezak
6eb2fe3028
Device working volumes are configurable from setup
2014-08-03 22:11:45 -04:00
mwerezak
5d0ce492b7
Updates dual port vent pumps
2014-08-03 15:17:28 -04:00
mwerezak
8d04a83e97
Updates gas coolers, upgrading of coolers/heaters
2014-08-03 14:34:31 -04:00
mwerezak
cf3a37d732
Fixes #5852
2014-08-03 12:32:37 -04:00
mwerezak
cf9fe8de76
Fixes some handcuff oversights
...
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
2014-08-03 11:49:37 -04:00
Walter0o
2dd71b53a7
adds lipstick wiping to proper paper/attack()
2014-08-03 13:52:59 +02:00
Walter0o
a586c1dd70
remove double paper/attack() definition
2014-08-03 13:52:47 +02:00
Loganbacca
b8f31c0b0a
Train fixes and balancing
...
- Slows trains to 90% of running speed
- Changes train impact damage to only take into account speed, not train length (otherwise you could insta kill people with a long enough train)
- Fixes a bug with towed cars ghosting through closed airlocks
- Stuns mobs who fall off a train that has blown up
- Fixes mobs standing/lying on vehicles
- Fixes exploding trains not decoupling correctly
2014-08-03 20:45:41 +12:00
mwerezak
cb2f68f81e
Merge remote-tracking branch 'upstream/dev' into power-net
2014-08-03 01:50:51 -04:00
mwerezak
ecdd9b62e9
Omni-devices
2014-08-03 01:38:31 -04:00
Loganbacca
b57a814fb2
Reversing fix
...
- Allows cargo tugs to reverse their direction if they are not towing anything
2014-08-03 16:42:14 +12:00
Loganbacca
500fc11db9
Verb fix
...
- Handles verb changes in the turn_off() and turn_on() procs
2014-08-03 16:36:24 +12:00
Zuhayr
05a1de6bf4
Merge pull request #5880 from Whitellama/master
...
Fixes #5870 (glasses being named inconsistently) and unreported issue of wet rags making glass-hit noises when you wash down a window
2014-08-03 13:05:43 +09:30
Zuhayr
eae182725a
Merge pull request #5865 from mwerezak/shock-fix
...
Fixes siemens_coefficent not affecting shock damage
2014-08-03 13:04:52 +09:30
Zuhayr
f510c05865
Merge pull request #5862 from mwerezak/stun-baton
...
Stun Baton Nerf
2014-08-03 12:59:54 +09:30
Zuhayr
75ff627046
Merge pull request #5868 from JimTheCactus/getFlatIcon_runtime
...
Fixes getFlatIcon Runtime on Atoms with no Icon
2014-08-03 12:59:14 +09:30
Zuhayr
67799a5324
Merge pull request #5871 from PsiOmegaDelta/PhotoAI
...
Fixes runtime error when borgs attempt to sync photos with master AI
2014-08-03 12:58:15 +09:30
Zuhayr
2619fb61ce
Merge pull request #5872 from PsiOmegaDelta/Manifest
...
Fixes #5867
2014-08-03 12:57:19 +09:30
Zuhayr
ab54e7e2d6
Merge pull request #5878 from Walter0o/aliums
...
fixes alien castes not understanding each other
2014-08-03 12:56:47 +09:30
Zuhayr
c6b40dbc1a
Merge pull request #5877 from Walter0o/dna_fix
...
fixes runtime with calling PP on dna-less mobs
2014-08-03 12:56:22 +09:30
mwerezak
3647fa4d7d
Adds gas mixing proc and updates gas mixer
...
Also includes a whole bunch of fixes and updates for atmos machinery
2014-08-02 18:35:57 -04:00
Mloc
e2ea86eab1
Merge pull request #5699 from Zuhayr/calamity
...
Calamity mode.
2014-08-02 11:39:29 +01:00
mwerezak
91d503e209
Removes duplicate code from human/bullet_act
...
Also moves stun projectile handling up to living/bullet_act, as all the
human specific code has been moved to other procs
2014-08-01 23:57:18 -04:00
mwerezak
d034511ee6
Updates gas filter
2014-08-01 22:59:13 -04:00
mwerezak
f0016df4f3
Adds gas filtering proc
2014-08-01 20:37:48 -04:00
Whitellama
a36becad2b
Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag)
2014-08-01 17:05:54 -07:00
Whitellama
dad248d49d
Fixed #5870 : Glasses being labeled both 'glass' and 'Drinking glass' inconsistently
2014-08-01 16:39:19 -07:00
