Commit Graph

18750 Commits

Author SHA1 Message Date
PsiOmega
8c47843af9 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-05-14 22:10:10 +02:00
Ccomp5950
1e6921f924 Merge pull request #9268 from Mloc/lightwrite
fix for "cleaning light"
2015-05-14 15:08:03 -04:00
Chinsky
8d83e8d452 Merge pull request #9202 from Zuhayr/customitems
Custom items refactor.
2015-05-14 21:47:04 +03:00
Hubblenaut
dfd3a679a8 camera rebalance 2015-05-14 20:02:09 +02:00
Chinsky
a4285a0c72 Merge pull request #9243 from PsiOmegaDelta/Mapping
Fixes pipes on the asteroid disappearing into limbo.
2015-05-14 20:43:08 +03:00
Chinsky
c1cb5c4829 Merge pull request #9245 from PsiOmegaDelta/ProcDivision
Minor proc division.
2015-05-14 20:38:57 +03:00
Mloc
d95701a7b5 fix for "cleaning light"
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-14 18:03:18 +01:00
Ccomp5950
4ec41c73ca Merge pull request #9195 from atlantiscze/radio-fix
Fixes common channel radios not working.
2015-05-14 12:34:43 -04:00
PsiOmega
9006419fcd Creates a default vent for atmospherics tanks. 2015-05-14 15:31:39 +02:00
Loganbacca
e3564a5d80 MULE destination update
- MULE destination selection is now handled using a list
2015-05-15 00:03:38 +12:00
Mloc
d6f4828f2a fix an issue with destroying light sources that have 0 light_range
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-14 10:58:52 +01:00
PsiOmegaDelta
9ed8f69e02 Merge pull request #9240 from Techhead0/internalsBox
Moves survival boxes to species datums.
2015-05-14 09:38:24 +02:00
mwerezak
aeb1f5ae68 Updates instances of if(cell.use(...)) 2015-05-14 01:52:04 -04:00
mwerezak
3c557b9137 Adds tail icon caching, adds frame offset to dmi for looped animations. 2015-05-14 00:14:47 -04:00
Chinsky
713deb4137 Merge pull request #9253 from PsiOmegaDelta/StealthFixes
Adjusts rig stealth module costs.
2015-05-14 04:17:56 +03:00
Chinsky
dd008c7790 Merge pull request #9254 from PsiOmegaDelta/CellDepletion
Using more energy than a cell has stored now drains the cell.
2015-05-14 04:17:43 +03:00
PsiOmega
3d1b671703 Asking for more energy than a cell has stored now drains the cell.
Fixes #9252.
2015-05-13 23:38:49 +02:00
GinjaNinja32
428014c372 Layer and throwpass fix. 2015-05-13 22:06:27 +01:00
PsiOmega
91f67e5dc5 Adjusts rig stealth module costs.
Activation and active power costs were previously a tenth of the same costs for a mere energy blade.
Now costs matches that of an energy blade.
2015-05-13 22:38:52 +02:00
GinjaNinja32
5820873dab Makes gambling tables constructable. 2015-05-13 21:34:31 +01:00
GinjaNinja32
fb329fb8e0 Merge remote-tracking branch 'upstream/dev' into new_tables 2015-05-13 20:46:58 +01:00
I HATE GITHUB SO MUCH!
a7d0047b27 Fixes a problem with sql population logging where players and admins are placed on different rows
Replaces two procs:
proc/sql_poll_admins()
proc/sql_poll_players()

With the proc:
proc/sql_poll_population()

Which does the same thing, except fixes and issue with sql logging, where player counts and admin counts would be placed in different rows:
Pictures for comparison:
Before: https://i.imgur.com/As4hAV8.png
After: http://i.imgur.com/ssm20IQ.png
2015-05-13 20:46:36 +01:00
GinjaNinja32
a353c90159 Super-small fix. 2015-05-13 20:41:40 +01:00
GinjaNinja32
5f65565f45 Bugfixes, removing the remnants of table_parts, changelog. 2015-05-13 20:40:00 +01:00
GinjaNinja32
4b87799072 New tables, code section. Changelog entry soon. 2015-05-13 19:08:39 +01:00
Daranz
b95692e484 Fix a problem in human/has_eyes() 2015-05-13 13:58:37 -04:00
PsiOmega
7b67b44e38 Minor proc division.
Attempts to discourage the creation of large procs.
2015-05-13 17:38:23 +02:00
Chinsky
2b1271d633 Merge pull request #9242 from PsiOmegaDelta/MechWreck
Fixes #9221.
2015-05-13 18:10:24 +03:00
Chinsky
ef79eb920d Merge pull request #9224 from PsiOmegaDelta/BrigGarbage
Map cleaning.
2015-05-13 18:09:28 +03:00
Chinsky
4108e82b6b Merge pull request #9208 from atlantiscze/rolling-brownouts
Fixes dev power issues
2015-05-13 18:09:16 +03:00
PsiOmega
cb5535a64b Fixes #9221.
Removes premature loc = null change.
Also fixes an issue occuring when the impact of an ion bullet would wreck a mech before triggering the EMP.
This would cause null runtimes as a now removed object would be accessed.
2015-05-13 12:37:18 +02:00
Techhead0
875a4fd893 Moves equip_survival_gear into job controller, species gear into datums. 2015-05-13 04:07:01 -04:00
Zuhayr
1dfade1a33 master>dev 2015-05-13 17:09:57 +09:30
Zuhayr
38e7cb8774 Minor amendments to mech kits and icons. 2015-05-13 17:04:52 +09:30
Zuhayr
3c10cc5852 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into customitems 2015-05-13 17:00:10 +09:30
Techhead0
93767c589e Adds beanbag shells to bar backroom.
Also, fixes.
2015-05-13 03:30:07 -04:00
Zuhayr
847f1baaa8 Merge pull request #9228 from Techhead0/portablepump-in
PAPs now use external pressure when pumping in.
2015-05-13 16:59:16 +09:30
Techhead0
f41300bbe3 Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox
Conflicts:
	maps/exodus-1.dmm
2015-05-13 03:10:36 -04:00
Techhead0
e38ef1c7ef Moves survival boxes to species datums.
Surivival gear is now assigned based on species. Most
species get standard gear, but Vox receive a nitrogen
tank instead, and Diona obtain an emergency flare
instead of a survival box.
As a side effect, engineers no longer spawn with larger
emergency tanks.
Fixes #9237
2015-05-13 02:31:17 -04:00
mwerezak
fe46049b17 Adds tail animations
Adds a selection of emotes to control tail animations, and animated sprites for tajaran by 'Full of Skittles'
2015-05-13 01:40:08 -04:00
Atlantiscze
616e9c773f Changes order of processing
- Machinery is now processed before powernets, using data from previous tick. This fixes various UI issues with power related machinery, such as, SMES always showing output load of 100%. Otherwise has no changing effect on gameplay.
2015-05-13 06:06:08 +02:00
Zuhayr
a9f936fe42 Added exosuit customisation kits to cargo. 2015-05-13 11:20:54 +09:30
Zuhayr
eef2f589ce Housekeeping. 2015-05-13 10:32:26 +09:30
Techhead0
bdf4400695 PAPs now use external pressure when pumping in.
This allows Portable Air Pumps to be effectively used for draining rooms
and air tanks.
Also, default cells in pumps and scrubbers changed from 1k basic cells
to 5k heavy-duty cells.
2015-05-12 13:55:06 -04:00
PsiOmega
ab6c4e74cb Merge remote-tracking branch 'upstream/dev' into BrigGarbage 2015-05-12 19:06:56 +02:00
Chinsky
ad67215b08 Merge pull request #9073 from PsiOmegaDelta/QDels
Implementing Destroy():s
2015-05-12 18:26:57 +03:00
Chinsky
c15c69b008 Merge pull request #8722 from Hubblenaut/dev
Context-Based: Grab Intent [READY FOR REVIEW]
2015-05-12 18:23:56 +03:00
Hubblenaut
32b463237f Final adjustments to icons, adds delay to pinning 2015-05-12 17:21:37 +02:00
Atlantiscze
165de0ad0e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into rolling-brownouts 2015-05-12 17:19:36 +02:00
GinjaNinja32
c952507f3c Fixes carp attacking mechs over z-levels
Fixes #9198.
2015-05-12 15:53:28 +01:00